From 0759aeaaae985f97d458d79253b2455bd047d9dd Mon Sep 17 00:00:00 2001
From: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
Date: Fri, 30 Sep 2022 12:32:50 +0200
Subject: SSH.sh: Reenable pi user if selected in SSH

---
 bin/ncp/NETWORKING/SSH.sh    | 3 +++
 etc/ncp-config.d/dnsmasq.cfg | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bin/ncp/NETWORKING/SSH.sh b/bin/ncp/NETWORKING/SSH.sh
index 182b5978..9092978b 100644
--- a/bin/ncp/NETWORKING/SSH.sh
+++ b/bin/ncp/NETWORKING/SSH.sh
@@ -38,6 +38,9 @@ configure()
   id "$USER" &>/dev/null || { echo "$USER doesn't exist"; return 1; }
   echo -e "$PASS\n$CONFIRM" | passwd "$USER" || return 1
 
+  # Reenable pi user
+  [[ "$USER" == "pi" ]] && usermod pi -s /bin/bash
+
   # Check for insecure default pi password ( taken from old jessie method )
   # TODO Due to Debian bug #1003151 with mkpasswd this feature is not working properly at the moment - https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1837456.html
   #local SHADOW SALT HASH
diff --git a/etc/ncp-config.d/dnsmasq.cfg b/etc/ncp-config.d/dnsmasq.cfg
index 594023bf..f14da6fc 100644
--- a/etc/ncp-config.d/dnsmasq.cfg
+++ b/etc/ncp-config.d/dnsmasq.cfg
@@ -3,7 +3,7 @@
   "name": "Dnsmasq, to serve names of local machines which are not in the global DNS",
   "title": "dnsmasq",
   "description": "DNS server with cache",
-  "info": "Remember to point your PC and devices DNS or\nyour router DNS to your Raspberry Pi IP",
+  "info": "Remember to point your PC and devices DNS or\nyour router DNS to your NCP IP",
   "infotitle": "",
   "params": [
     {
-- 
cgit v1.2.3