From 3bdee6bd3e9d814fe2473c595d0bd57ca8700d10 Mon Sep 17 00:00:00 2001
From: Tim Eertmoed <alientim@noreply.localhost>
Date: Mon, 21 Oct 2024 16:56:52 +0200
Subject: [PATCH] install.sh aktualisiert

---
 install.sh | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/install.sh b/install.sh
index 5d0759d..06695ff 100644
--- a/install.sh
+++ b/install.sh
@@ -26,15 +26,9 @@ echo -e "${GREEN}✔${NC} User 'loginuser' created..."
 
 echo -e "${RED}→${NC} Setting permissions for 'loginuser'..."
 sudo tee /etc/sudoers.d/loginuser >/dev/null << 'EOF'
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart watchdog
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart chromium-monitor
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl start chromium-monitor
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/echo
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/cp
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/sed
-loginuser ALL=(ALL) NOPASSWD: /usr/sbin/reboot
-loginuser ALL=(ALL) NOPASSWD: /usr/sbin/dhclient eth0
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/fbset
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart watchdog, /usr/bin/systemctl restart chromium-monitor
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/echo, /usr/bin/cp, /usr/bin/sed
+loginuser ALL=(ALL) NOPASSWD: /usr/sbin/reboot, /usr/sbin/dhclient eth0, /usr/bin/fbset
 loginuser ALL=(ALL) NOPASSWD: /usr/bin/cat /var/lib/dhcp/*
 EOF
 sudo usermod -aG video loginuser >>/var/log/install 2>&1
@@ -48,22 +42,31 @@ sudo passwd -l root >>/var/log/install 2>&1
 echo -e "${GREEN}✔${NC} Root login disabled..."
 
 echo -e "${RED}→${NC} Copying required files..."
-sudo rm ./rps-client/.gitignore ./rps-client/LICENSE ./rps-client/README.md >>/var/log/install 2>&1
-sudo rsync -a --numeric-ids --info=progress2 --no-owner --no-group ./rps-client/* / >>/var/log/install 2>&1
+sudo rsync -a --numeric-ids --info=progress2 --no-owner --no-group \
+    ./rps-client/boot/ro-root.sh /boot/ro-root.sh \
+    ./rps-client/boot/firmware/ro-root.sh /boot/firmware/ro-root.sh \
+    ./rps-client/etc/dhcp/dhclient.conf /etc/dhcp/dhclient.conf \
+    ./rps-client/etc/systemd/system/watchdog.service /etc/systemd/system/watchdog.service \
+    ./rps-client/etc/systemd/system/chromium-monitor.service /etc/systemd/system/chromium-monitor.service \
+    ./rps-client/etc/systemd/system/getty@tty1.service.d/override.conf /etc/systemd/system/getty@tty1.service.d/override.conf \
+    ./rps-client/etc/chromium/policies/managed/disable_password_saving.json /etc/chromium/policies/managed/disable_password_saving.json \
+    ./rps-client/home/loginuser/.bash_profile /home/loginuser/.bash_profile \
+    ./rps-client/home/loginuser/.xinitrc /home/loginuser/.xinitrc \
+    ./rps-client/home/wis/.ssh/id_rsa.pub /home/wis/.ssh/id_rsa.pub \
+    ./rps-client/root/remove_unused_kernel.sh /root/remove_unused_kernel.sh \
+    ./rps-client/root/.vnc/config.d/vncserver-x11 /root/.vnc/config.d/vncserver-x11 \
+    ./rps-client/usr/bin/chromium-monitor /usr/bin/chromium-monitor \
+    ./rps-client/usr/bin/watchdog /usr/bin/watchdog >>/var/log/install 2>&1
 echo -e "${GREEN}✔${NC} Required files copied..."
 
 echo -e "${RED}→${NC} Setting file permissions..."
 sudo chown loginuser:loginuser -R /home/loginuser >>/var/log/install 2>&1
-sudo chmod +x /root/remove_unused_kernel.sh >>/var/log/install 2>&1
-sudo chmod +x /usr/bin/watchdog >>/var/log/install 2>&1
-sudo chmod +x /usr/bin/chromium-monitor >>/var/log/install 2>&1
+sudo chmod +x /root/remove_unused_kernel.sh /usr/bin/watchdog /usr/bin/chromium-monitor >>/var/log/install 2>&1
 echo -e "${GREEN}✔${NC} File permissions set..."
 
 echo -e "${RED}→${NC} Enabling services..."
 sudo systemctl daemon-reload >>/var/log/install 2>&1
-sudo systemctl enable watchdog >>/var/log/install 2>&1
-sudo systemctl enable chromium-monitor >>/var/log/install 2>&1
-sudo systemctl enable vncserver-x11-serviced.service >>/var/log/install 2>&1
+sudo systemctl enable watchdog chromium-monitor vncserver-x11-serviced.service >>/var/log/install 2>&1
 sudo systemctl restart getty@tty1 >>/var/log/install 2>&1
 echo -e "${GREEN}✔${NC} Services enabled..."
 
@@ -79,5 +82,5 @@ echo -e "${GREEN}✔${NC} Installation complete. Press any key to reboot..."
 read -n 1 -s
 sudo reboot
 
-# Version 1.0:
+# Version 1.1:
 # Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.