install.sh aktualisiert

README.md

@@ -1,7 +1,7 @@
 # RPS-Client
 
 ```bash
-wget -qO- --header 'Authorization:token 9031f8d227dd83ba601680bf3a9f6c2d26c1a970' https://gitea.int.eertmoed.net/WiS/RPS-Client/archive/latest.tar.gz | tar xvz ; bash ./rps-client/install.sh ;
+wget -qO- --header 'Authorization:token 9031f8d227dd83ba601680bf3a9f6c2d26c1a970' https://gitea.int.eertmoed.net/WiS/RPS-Client/archive/latest.tar.gz | tar xvz ; bash /root/rps-client/install.sh ;
 ```
 
 ```ruby

home/loginuser/.xinitrc

@@ -24,7 +24,11 @@ then
 	WBS=https://www.wis.gmbh/
 fi
 
-#Start Chromium
+sudo systemctl stop watchdog-monitor
+sudo systemctl stop chromium-monitor
+sudo systemctl start watchdog-monitor
+sudo systemctl start chromium-monitor
+
 chromium-browser $WBS \
   --window-size=$RES \
   --window-position=0,0 \

install.sh

@@ -11,19 +11,19 @@ print_status() {
     echo -e "${GREEN}✔${NC} ${1} completed."
 }
 
-echo -e "${RED}→${NC} Starting System Update..."
+echo -e "${RED}→${NC} Starting System Update..." | tee -a /var/log/install
 sudo apt update >>/var/log/install 2>&1 && print_status "System Update"
 sudo apt upgrade -y >>/var/log/install 2>&1 && print_status "System Upgrade"
 sudo apt dist-upgrade -y >>/var/log/install 2>&1 && print_status "System Dist-Upgrade"
 
-echo -e "${RED}→${NC} Installing required packages..."
+echo -e "${RED}→${NC} Installing required packages..." | tee -a /var/log/install
 sudo apt install --no-install-recommends xserver-xorg x11-xserver-utils xinit chromium-browser fonts-noto-color-emoji nfs-common watchdog xdotool rsync -y >>/var/log/install 2>&1 && print_status "Required packages installed"
 sudo apt install realvnc-vnc-server overlayroot -y >>/var/log/install 2>&1 && print_status "VNC and Overlayroot installed"
 sudo apt autoremove -y >>/var/log/install 2>&1 && print_status "Autoremove"
 sudo apt clean >>/var/log/install 2>&1 && print_status "Clean"
 rm -rf /var/lib/apt/lists/* >>/var/log/install 2>&1 && print_status "Clear cache"
 
-echo -e "${GREEN}→${NC} Configuring Raspberry Pi settings..."
+echo -e "${RED}→${NC} Configuring Raspberry Pi settings..." | tee -a /var/log/install
 sudo raspi-config nonint do_camera 0 >> /var/log/install 2>&1 && print_status "Camera disabled"
 sudo raspi-config nonint do_vnc 0 >> /var/log/install 2>&1 && print_status "VNC enabled"
 sudo raspi-config nonint do_spi 0 >> /var/log/install 2>&1 && print_status "SPI disabled"
@@ -36,43 +36,72 @@ sudo raspi-config nonint do_locale "de_DE.UTF-8" "de_DE.UTF-8" >> /var/log/insta
 sudo raspi-config nonint do_timezone "Europe/Berlin" >> /var/log/install 2>&1 && print_status "Timezone set to Europe/Berlin"
 sudo raspi-config nonint do_boot_order 3 >> /var/log/install 2>&1 && print_status "Boot order set to network boot"
 
-echo -e "${RED}→${NC} Configuring VNC..."
+echo -e "${RED}→${NC} Creating user 'loginuser'..." | tee -a /var/log/install
+sudo adduser --disabled-password --gecos "" loginuser >>/var/log/install 2>&1 && print_status "User 'loginuser' created"
+
+echo -e "${RED}→${NC} Copy requiered files..." | tee -a /var/log/install
+mkdir -p /etc/chromium/policies/managed /home/wis/.ssh /usr/bin/custom
+declare -A files=(
+    ["/root/rps-client/boot/ro-root.sh"]="/boot/ro-root.sh"
+    ["/root/rps-client/boot/firmware/ro-root.sh"]="/boot/firmware/ro-root.sh"
+    ["/root/rps-client/etc/dhcp/dhclient.conf"]="/etc/dhcp/dhclient.conf"
+    ["/root/rps-client/etc/systemd/system/hostname.service"]="/etc/systemd/system/hostname.service"
+    ["/root/rps-client/etc/systemd/system/watchdog-monitor.service"]="/etc/systemd/system/watchdog-monitor.service"
+    ["/root/rps-client/etc/systemd/system/chromium-monitor.service"]="/etc/systemd/system/chromium-monitor.service"
+    ["/root/rps-client/etc/systemd/system/getty@tty1.service.d/override.conf"]="/etc/systemd/system/getty@tty1.service.d/override.conf"
+    ["/root/rps-client/etc/chromium/policies/managed/disable_password_saving.json"]="/etc/chromium/policies/managed/disable_password_saving.json"
+    ["/root/rps-client/home/loginuser/.bash_profile"]="/home/loginuser/.bash_profile"
+    ["/root/rps-client/home/loginuser/.xinitrc"]="/home/loginuser/.xinitrc"
+    ["/root/rps-client/home/wis/.ssh/id_rsa.pub"]="/home/wis/.ssh/id_rsa.pub"
+    ["/root/rps-client/root/remove_unused_kernel.sh"]="/root/remove_unused_kernel.sh"
+    ["/root/rps-client/usr/bin/custom/hostname"]="/usr/bin/custom/hostname"
+    ["/root/rps-client/usr/bin/custom/chromium-monitor"]="/usr/bin/custom/chromium-monitor"
+    ["/root/rps-client/usr/bin/custom/watchdog-monitor"]="/usr/bin/custom/watchdog-monitor"
+)
+RSYNC_OPTS="-a --numeric-ids --info=progress2 --no-owner --no-group"
+for src in "${!files[@]}"; do
+    dst="${files[$src]}"
+    echo "Copying $src to $dst..."
+    sudo rsync $RSYNC_OPTS "$src" "$dst" >>/var/log/install 2>&1 && print_status "$src copied to $dst"
+done
+print_status "All files have been successfully copied"
+
+echo -e "${RED}→${NC} Configuring VNC..." | tee -a /var/log/install
 sudo systemctl enable vncserver-x11-serviced.service >>/var/log/install 2>&1 && print_status "VNC service enabled"
 sudo systemctl start vncserver-x11-serviced.service >>/var/log/install 2>&1 && print_status "VNC service started"
 CONFIG_FILE="/root/.vnc/config.d/vncserver-x11"
 if [ ! -d "$(dirname "$CONFIG_FILE")" ]; then
     mkdir -p "$(dirname "$CONFIG_FILE")"
-    print_status "Created directory for VNC config." >> /var/log/install 2>&1
+    echo -e "${GREEN}✔${NC} Created directory for VNC config." | tee -a /var/log/install
 fi
 read -p "Do you want to set a VNC password? (y/n): " -r
 if [[ $REPLY =~ ^[Yy](e[Ss]?)?$ ]]; then
     vncpasswd
-    print_status "VNC password has been set." >> /var/log/install 2>&1
+    echo -e "${GREEN}✔${NC} VNC password has been set." | tee -a /var/log/install
 else
-    echo -e "${RED}✖${NC} No VNC password will be set." >> /var/log/install 2>&1
+    echo -e "${GREEN}✔${NC} No VNC password will be set." | tee -a /var/log/install
 fi
 if [ "$(vncpasswd -o)" = 'none' ]; then
-    echo "Authentication=None" >> "$CONFIG_FILE"
+    echo "Authentication=none" >> "$CONFIG_FILE"
     echo "Geometry=1920x1080" >> "$CONFIG_FILE"
     echo "#  Version 1.0:" >> "$CONFIG_FILE"
     echo "#  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspbian as custom PXE init script." >> "$CONFIG_FILE"
     print_status "VNC config set to no authentication with geometry 1920x1080." >> /var/log/install 2>&1
 else
-    echo "Authentication=VNC" >> "$CONFIG_FILE"
+    echo "Authentication=none" >> "$CONFIG_FILE"
     echo "Geometry=1920x1080" >> "$CONFIG_FILE"
     echo "#  Version 1.0:" >> "$CONFIG_FILE"
     echo "#  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspbian as custom PXE init script." >> "$CONFIG_FILE"
     print_status "VNC password is set. Authentication will be required." >> /var/log/install 2>&1
 fi
 sudo raspi-config nonint do_vnc 0 >>/var/log/install 2>&1 && print_status "VNC enabled in raspi-config"
+sudo systemctl unmask vncserver-x11-serviced.service >>/var/log/install 2>&1 && print_status "VNC unmask"
+sudo systemctl enable vncserver-x11-serviced.service >>/var/log/install 2>&1 && print_status "VNC enabled systemctl"
 
-echo -e "${RED}→${NC} Creating user 'loginuser'..."
-sudo adduser --disabled-password --gecos "" loginuser >>/var/log/install 2>&1 && print_status "User 'loginuser' created"
-
-echo -e "${RED}→${NC} Setting permissions for 'loginuser'..."
+echo -e "${RED}→${NC} Setting permissions for 'loginuser'..." | tee -a /var/log/install
 sudo tee /etc/sudoers.d/loginuser >/dev/null << 'EOF'
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl start watchdog, /usr/bin/systemctl stop watchdog, /usr/bin/systemctl restart watchdog
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl stop watchdog-monitor
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl stop chromium-monitor, /usr/bin/systemctl start chromium-monitor
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl stop watchdog-monitor, /usr/bin/systemctl start watchdog-monitor
 loginuser ALL=(ALL) NOPASSWD: /usr/bin/cat /var/lib/dhcp/*
 loginuser ALL=(ALL) NOPASSWD: /usr/bin/cp /etc/watchdog.conf /etc/watchdog.conf.bak
 loginuser ALL=(ALL) NOPASSWD: /usr/bin/tee /etc/watchdog.conf, /usr/bin/tee -a /etc/watchdog.conf
@@ -85,87 +114,61 @@ loginuser ALL=(ALL) NOPASSWD: /usr/sbin/reboot
 EOF
 sudo usermod -aG video loginuser >>/var/log/install 2>&1 && print_status "Permissions for 'loginuser' set"
 
-echo -e "${RED}→${NC} Disabling root login..."
+echo -e "${RED}→${NC} Disabling root login..." | tee -a /var/log/install
 sudo tee /etc/ssh/sshd_config >/dev/null << 'EOF'
 PermitRootLogin no
 EOF
 sudo passwd -l root >>/var/log/install 2>&1 && print_status "Root login disabled"
 
-echo -e "${RED}→${NC} Copy requiered files..."
-declare -A files=(
-    ["./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/hostname.service"]="/etc/systemd/system/hostname.service"
-    ["./rps-client/etc/systemd/system/watchdog-monitor.service"]="/etc/systemd/system/watchdog-monitor.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/custom/hostname"]="/usr/bin/custom/hostname"
-    ["./rps-client/usr/bin/custom/chromium-monitor"]="/usr/bin/custom/chromium-monitor"
-    ["./rps-client/usr/bin/custom/watchdog-monitor"]="/usr/bin/custom/watchdog-monitor"
-)
-RSYNC_OPTS="-a --numeric-ids --info=progress2 --no-owner --no-group"
-for src in "${!files[@]}"; do
-    dst="${files[$src]}"
-    echo "Copying $src to $dst..."
-    sudo rsync $RSYNC_OPTS "$src" "$dst" >>/var/log/install 2>&1 && print_status "$src copied to $dst"
-done
-print_status "All files have been successfully copied"
+echo -e "${RED}→${NC} Setting file permissions..." | tee -a /var/log/install
+sudo chown loginuser:loginuser -R /home/loginuser >>/var/log/install 2>&1 && print_status "File permissions for 'loginuser' set"
+sudo chown wis:wis -R /home/wis >>/var/log/install 2>&1 && print_status "File permissions for 'wis' set"
 
-echo -e "${RED}→${NC} Setting file permissions..."
-sudo chown loginuser:loginuser -R /home/loginuser >>/var/log/install 2>&1 && print_status "File permissions set"
-
-echo -e "${RED}→${NC} Creating log files..."
+echo -e "${RED}→${NC} Creating log files..." | tee -a /var/log/install
 sudo touch /var/log/watchdog.log /var/log/chromium-monitor.log /var/log/hostname.log >>/var/log/install 2>&1 && print_status "Log files created"
 sudo chown loginuser:loginuser /var/log/watchdog.log /var/log/chromium-monitor.log /var/log/hostname.log >>/var/log/install 2>&1 && print_status "Ownership set for log files"
 sudo chmod 777 /var/log/watchdog.log /var/log/chromium-monitor.log /var/log/hostname.log >>/var/log/install 2>&1 && print_status "Permissions set for log files"
 sudo chmod +x /usr/bin/custom/* >>/var/log/install 2>&1 && print_status "Permissions set for script files"
 
-echo -e "${RED}→${NC} Enabling services..."
+echo -e "${RED}→${NC} Enabling services..." | tee -a /var/log/install
 sudo systemctl daemon-reload >>/var/log/install 2>&1 && print_status "Daemon reloaded"
 sudo systemctl enable hostname watchdog chromium-monitor vncserver-x11-serviced.service getty@tty1 >>/var/log/install 2>&1 && print_status "Services enabled"
 sudo systemctl restart getty@tty1 >>/var/log/install 2>&1 && print_status "getty service restarted"
 
-echo -e "${RED}→${NC} Do you want to clean up unused kernels? (yes/y/ye to proceed):"
+echo -e "${RED}→${NC} Do you want to clean up unused kernels? (y/n):" | tee -a /var/log/install
 read -r clean_kernels
 if [[ "$clean_kernels" =~ ^[Yy](e[Ss]?)?$ ]]; then
-    echo -e "${RED}→${NC} Cleaning up unused kernels..."
-    sudo bash /root/remove_unused_kernel.sh -u -e >>/var/log/install 2>&1 && print_status "Unused kernels cleaned up"
+    echo -e "${RED}→${NC} Cleaning up unused kernels..." | tee -a /var/log/install
+    yes yes | head -n 2 | sudo bash /root/remove_unused_kernel.sh -u -e >>/var/log/install 2>&1 && print_status "Unused kernels cleaned up"
 else
-    echo -e "${RED}→${NC} Skipping unused kernel cleanup..."
-    print_status "Cleanup has been skipped" >> /var/log/install 2>&1
+    echo -e "${RED}→${NC} Skipping unused kernel cleanup..." | tee -a /var/log/install
+    echo -e "${GREEN}✔${NC} Cleanup has been skipped" | tee -a /var/log/install
 fi
 
-echo -e "${RED}→${NC} Configuring Overlayroot..."
-CONFIG_FILE="/etc/overlayroot.conf"
-echo 'overlayroot_cfgdisk="disabled"' | sudo tee "$CONFIG_FILE"
-echo 'overlayroot=""' | sudo tee -a "$CONFIG_FILE"
-read -p "Do you want to activate overlayfs? (y/n): " -r
-if [[ $REPLY =~ ^[Yy](e[Ss]?)?$ ]]; then
-    echo 'overlayroot="tmpfs:overlayfs"' | sudo tee -a "$CONFIG_FILE"
-    sudo raspi-config nonint do_overlayroot 0 >>/var/log/install 2>&1 && print_status "Overlayroot enabled in raspi-config"
-    print_status "Overlayroot has been activated." >> /var/log/install 2>&1
-else
-    echo 'overlayroot=""' | sudo tee -a "$CONFIG_FILE"
-    echo -e "${RED}✖${NC} Overlayroot has not been activated." >> /var/log/install 2>&1
-fi
-
-echo -e "${RED}→${NC} Cleaning up installer..."
-sudo rm -rf ./rps-client >>/var/log/install 2>&1 && print_status "Installer cleaned up"
-
-echo -e "${GREEN}✔${NC} Installation complete. Press any key to reboot..." >> /var/log/install 2>&1
-read -n 1 -s
-sudo reboot
-
-
 echo "performance" | sudo tee /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
 sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target
 
+echo -e "${RED}→${NC} Cleaning up installer..." | tee -a /var/log/install
+sudo rm -rf ./rps-client >>/var/log/install 2>&1 && print_status "Installer cleaned up"
+
+echo -e "${RED}→${NC} Configuring Overlayroot..." | tee -a /var/log/install
+CONFIG_FILE="/etc/overlayroot.conf"
+echo 'overlayroot_cfgdisk="disabled"' | sudo tee "$CONFIG_FILE" >/dev/null
+echo 'overlayroot=""' | sudo tee -a "$CONFIG_FILE" >/dev/null
+read -p "Do you want to activate overlayfs? (y/n): " -r
+if [[ $REPLY =~ ^[Yy](e[Ss]?)?$ ]]; then
+    echo 'overlayroot="tmpfs:overlayfs"' | sudo tee -a "$CONFIG_FILE"
+    sudo raspi-config nonint do_overlayroot 0 >>/var/log/install 2>&1 && print_status "Overlayroot enabled in raspi-config"
+    echo -e "${GREEN}✔${NC} Overlayroot has been activated." | tee -a /var/log/install
+else
+    echo 'overlayroot=""' | sudo tee -a "$CONFIG_FILE"
+    echo -e "${GREEN}✔${NC} Overlayroot has not been activated." | tee -a /var/log/install
+fi
+
+echo -e "${GREEN}✔${NC} Installation complete. Press any key to reboot..." >> /var/log/install 2>&1
+read -n 1 -s
+
+sudo reboot
+
 # Version 1.2:
 # Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.