install.sh aktualisiert

.gitignore

@@ -1,15 +0,0 @@
-# ---> Linux
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-

README.md

@@ -1,10 +1,10 @@
-# RPS-Light-PXE
+# RPS-Client
 
 ```bash
-wget -qO- --header 'Authorization:token 9031f8d227dd83ba601680bf3a9f6c2d26c1a970' https://gitea.int.eertmoed.net/WiS/RPS-Light-PXE/archive/latest.tar.gz| tar xvz ; bash ./rps-light-pxe/install.sh ;
+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 ;
 ```
 
 ```ruby
-#  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.
 ```

etc/systemd/system/chromium-monitor.service

@@ -3,15 +3,17 @@ Description=A Service to monitor the Kiosk's current site
 After=network.target getty@tty1.service
 
 [Service]
-# Wait until Chromium is running
-ExecStartPre=-/bin/bash -c 'while ! pgrep -f chromium-browser > /dev/null; do sleep 5; done'
-ExecStartPre=-/usr/bin/sleep 20
+ExecStartPre=-/bin/sleep 10
 Type=simple
 User=loginuser
-ExecStart=/usr/bin/chromium-monitor
+ExecStart=/usr/bin/custom/chromium-monitor
+Restart=on-failure
+RestartSec=5s
+StandardOutput=append:/var/log/chromium-monitor.log
+StandardError=append:/var/log/chromium-monitor.log
 
 [Install]
 WantedBy=multi-user.target
 
-#  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.

etc/systemd/system/hostname.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Set Hostname from DHCP
+After=network.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/custom/hostname
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

etc/systemd/system/watchdog.service

@@ -3,13 +3,17 @@ Description=Watchdog Monitor Service
 After=network.target getty@tty1.service
 
 [Service]
-ExecStartPre=-/bin/sleep 120
+ExecStartPre=-/bin/sleep 10
 Type=simple
-ExecStart=/usr/bin/watchdog
+User=loginuser
+ExecStart=/usr/bin/watchdog/watchdog
 Restart=on-failure
+RestartSec=5s
+StandardOutput=append:/var/log/watchdog
+StandardError=append:/var/log/watchdog
 
 [Install]
 WantedBy=multi-user.target
 
-#  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.

home/wis/.ssh/id_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCYDmONGe644a3bWKAyX1W704B8fCwlj4x/QjwyJX6gKpX2hmtrxZtusK729wTxP0lr1Gzll9A8LAEGqW5/sxxJqwtYDMOEfINsgE8fmvg9XSmJ9t5zOxJAuQfJB/dmE2a2mX3VSH740czvJ6NKlf9BUeu+41ZZUilyHngfgpVxEIED/6ZHRrkMUfaY09IfvwmNiYPTtK4cufLBdeEoNJPQvYdY1i+N+cJstUzlDRs179w8CqLPuPhIb0iQ3WO1S1XXQH4vUm4MaMmK+hDR4J/pfhuI3DXulwE04rZFU2izXQwl5VdYLv8w31gcegyRz68p+LprusY4QiDP62yaUCTE6JdrjjQSxbEag+OqCzozfvoO+SxMdWsxg2eViM4sKTODc0cQBSA4HJcDWeag5LU9k4WGeuVVj8BCCBqh+93IqylqyK7AKMztVZNiftSBEbfK8ZoHawg5PM26LtCTz6YcmGhn/dHpcpyC8606+SHSTl5YinDaRjarCBM4nppD3o5pizVFKutI28Ys3wkVAe96njnJqIi/J5tNQgrbJmteCE3/9SWhpsXjnuZX1RaZYLE3bBg8Gisz/sm7rN3acVXe6QD03PIxwn9Xp8r3avzDkQKo4vqxoYK6JF6j3vs+U4WLElq+NtvuMewfAWF2cgL2quognLWUM5s0p1/zLzxa8w==

install.sh

@@ -6,80 +6,91 @@ NC='\033[0m' # No Color
 
 clear
 
+# Function to print status with a checkmark
+print_status() {
+    echo -e "${GREEN}✔${NC} ${1} completed."
+}
+
 echo -e "${RED}→${NC} Starting System Update..."
-sudo apt update >/dev/null 2>&1 && sudo apt upgrade -y >/dev/null 2>&1 && sudo apt dist-upgrade -y >/dev/null 2>&1 && sudo apt autoremove -y >/dev/null 2>&1 && sudo apt clean -y >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} System Update Completed..."
+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"
+sudo apt autoremove -y >>/var/log/install 2>&1 && print_status "Autoremove"
+sudo apt clean >>/var/log/install 2>&1 && print_status "Clean"
 
 echo -e "${RED}→${NC} Installing required packages..."
-sudo apt install --no-install-recommends xserver-xorg x11-xserver-utils xinit chromium-browser fonts-noto-color-emoji nfs-common watchdog xdotool rsync -y >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} Required packages installed..."
+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"
 
 echo -e "${RED}→${NC} Creating user 'loginuser'..."
-sudo adduser --disabled-password --gecos "" loginuser >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} User 'loginuser' created..."
+sudo adduser --disabled-password --gecos "" loginuser >>/var/log/install 2>&1 && print_status "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/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 >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} Permissions for 'loginuser' set..."
+sudo usermod -aG video loginuser >>/var/log/install 2>&1 && print_status "Permissions for 'loginuser' set"
 
 echo -e "${RED}→${NC} Disabling root login..."
 sudo tee /etc/ssh/sshd_config >/dev/null << 'EOF'
 PermitRootLogin no
 EOF
-sudo passwd -l root >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} Root login disabled..."
+sudo passwd -l root >>/var/log/install 2>&1 && print_status "Root login disabled"
 
 echo -e "${RED}→${NC} Copying required files..."
-sudo rm ./rps-light-pxe/.gitignore ./rps-light-pxe/LICENSE ./rps-light-pxe/README.md >/dev/null 2>&1
-sudo cp -r ./rps-light-pxe/ / >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} Required files copied..."
+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/hostname.service /etc/systemd/system/hostname.service \
+    ./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/custom/hostname /usr/bin/custom/hostname \
+    ./rps-client/usr/bin/custom/chromium-monitor /usr/bin/custom/chromium-monitor \
+    ./rps-client/usr/bin/custom/watchdog /usr/bin/custom/watchdog >>/var/log/install 2>&1 && print_status "Required files copied"
 
 echo -e "${RED}→${NC} Setting file permissions..."
-sudo chown loginuser:loginuser /home/loginuser/.xinitrc >/dev/null 2>&1
-sudo chown loginuser:loginuser /home/loginuser/.bash_profile >/dev/null 2>&1
-sudo chmod +x /root/remove_unused_kernel.sh >/dev/null 2>&1
-sudo chmod +x /usr/bin/watchdog >/dev/null 2>&1
-sudo chmod +x /usr/bin/chromium-monitor >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} File permissions set..."
+sudo chown loginuser:loginuser -R /home/loginuser >>/var/log/install 2>&1 && print_status "File permissions set"
+
+echo -e "${RED}→${NC} Creating log files..."
+sudo touch /var/log/watchdog.log /var/log/chromium-monitor.log >>/var/log/install 2>&1 && print_status "Log files created"
+
+echo -e "${RED}→${NC} Setting ownership for log files..."
+sudo chown loginuser:loginuser /var/log/watchdog.log /var/log/chromium-monitor.log >>/var/log/install 2>&1 && print_status "Ownership set for log files"
+
+echo -e "${RED}→${NC} Setting permissions for log files..."
+sudo chmod 664 /var/log/watchdog.log /var/log/chromium-monitor.log >>/var/log/install 2>&1 && print_status "Permissions set for log files"
 
 echo -e "${RED}→${NC} Enabling services..."
-sudo systemctl daemon-reload >/dev/null 2>&1
-sudo systemctl enable watchdog >/dev/null 2>&1
-sudo systemctl enable chromium-monitor >/dev/null 2>&1
-sudo systemctl enable getty@tty1 >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} Services enabled..."
+sudo systemctl daemon-reload >>/var/log/install 2>&1 && print_status "Daemon reloaded"
+sudo systemctl enable hostname watchdog chromium-monitor vncserver-x11-serviced.service >>/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} Cleaning up old kernels..."
-sudo bash /root/remove_unused_kernel.sh -u -e >/dev/null 2>&1
-sudo rm /root/remove_unused_kernel.sh >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} Old kernels cleaned up..."
+echo -e "${RED}→${NC} Do you want to clean up unused kernels? (yes/y/ye to proceed):"
+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"
+else
+    echo -e "${RED}→${NC} Skipping unused kernel cleanup."
+fi
 
 echo -e "${RED}→${NC} Cleaning up installer..."
-sudo rm -rf ./rps-light-pxe >/dev/null 2>&1
-echo -e "${GREEN}✔${NC} Installer cleaned up..."
+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."
+echo -e "${GREEN}✔${NC} Installation complete. Press any key to reboot..."
 read -n 1 -s
-sudo mkdir -p /etc/systemd/system/getty@tty1.service.d
-sudo tee /etc/systemd/system/getty@tty1.service.d/override.conf > /dev/null << 'EOF'
-[Service]
-ExecStart=
-ExecStart=-/sbin/agetty --autologin loginuser --noclear %I $TERM
-EOF
-sudo systemctl daemon-reload
-sudo systemctl restart getty@tty1
-sudo systemctl enable getty@tty1
 sudo reboot
 
-# Version 1.0:
+# Version 1.2:
 # Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.

root/.ssh/id_rsa.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCYDmONGe644a3bWKAyX1W704B8fCwlj4x/QjwyJX6gKpX2hmtrxZtusK729wTxP0lr1Gzll9A8LAEGqW5/sxxJqwtYDMOEfINsgE8fmvg9XSmJ9t5zOxJAuQfJB/dmE2a2mX3VSH740czvJ6NKlf9BUeu+41ZZUilyHngfgpVxEIED/6ZHRrkMUfaY09IfvwmNiYPTtK4cufLBdeEoNJPQvYdY1i+N+cJstUzlDRs179w8CqLPuPhIb0iQ3WO1S1XXQH4vUm4MaMmK+hDR4J/pfhuI3DXulwE04rZFU2izXQwl5VdYLv8w31gcegyRz68p+LprusY4QiDP62yaUCTE6JdrjjQSxbEag+OqCzozfvoO+SxMdWsxg2eViM4sKTODc0cQBSA4HJcDWeag5LU9k4WGeuVVj8BCCBqh+93IqylqyK7AKMztVZNiftSBEbfK8ZoHawg5PM26LtCTz6YcmGhn/dHpcpyC8606+SHSTl5YinDaRjarCBM4nppD3o5pizVFKutI28Ys3wkVAe96njnJqIi/J5tNQgrbJmteCE3/9SWhpsXjnuZX1RaZYLE3bBg8Gisz/sm7rN3acVXe6QD03PIxwn9Xp8r3avzDkQKo4vqxoYK6JF6j3vs+U4WLElq+NtvuMewfAWF2cgL2quognLWUM5s0p1/zLzxa8w==

usr/bin/custom/chromium-monitor

@@ -1,34 +1,56 @@
 #!/bin/bash 
+
+LOGFILE="/var/log/chromium-monitor.log"
+
 get_monitor() {
     sudo cat /var/lib/dhcp/* | grep -a "option monitor" | tail -1 | \
     awk '{ s = ""; for (i = 3; i <= NF; i++) s = s $i " "; print s}' | \
     awk -F '"' '{print $2}'
 }
+
 get_current_window() {
     DISPLAY=:0 xdotool getwindowfocus getwindowname | awk -F '- Chromium' '{print $1}'
 }
+
 monitor=""
 while [ -z "$monitor" ]; do
     monitor=$(get_monitor)
+    echo "Current monitor: $monitor" >> $LOGFILE  # Debug output
     if [ -z "$monitor" ]; then
         sleep 5
     fi
 done
+
 monitor_md5=$(echo -n ${monitor^^} | sed -e 's/^[[:space:]]*//' | md5sum | awk '{print $1}')
+echo "Monitor MD5: $monitor_md5" >> $LOGFILE  # Debug output
+
 while true; do
     new_monitor=$(get_monitor)
     new_current=$(get_current_window)
+
+    # Log the current state
+    echo "New monitor: $new_monitor" >> $LOGFILE  # Debug output
+    echo "New current window: $new_current" >> $LOGFILE  # Debug output
+
     if [ -n "$new_monitor" ] && [ -n "$new_current" ]; then
         new_monitor_md5=$(echo -n ${new_monitor^^} | sed -e 's/^[[:space:]]*//' | md5sum | awk '{print $1}')
         current_md5=$(echo -n ${new_current^^} | sed -e 's/^[[:space:]]*//' | md5sum | awk '{print $1}')
+
+        # Log the computed MD5 hashes
+        echo "New monitor MD5: $new_monitor_md5" >> $LOGFILE  # Debug output
+        echo "Current window MD5: $current_md5" >> $LOGFILE  # Debug output
+
         if [ "$new_monitor_md5" != "$monitor_md5" ] && [ "$current_md5" != "$monitor_md5" ]; then
-            echo "Mismatch detected. Rebooting now."
+            echo "Mismatch detected. Rebooting now." >> $LOGFILE
             sudo reboot
             exit 1
         fi
     else
-        echo "Either monitor or current is not available, skipping check."
+        echo "Either monitor or current is not available, skipping check." >> $LOGFILE
     fi
+
+    # Log the status before sleeping
+    echo "Sleeping for 5 seconds before the next check..." >> $LOGFILE
     sleep 5s
 done
 

usr/bin/custom/hostname

@@ -0,0 +1,35 @@
+#!/bin/bash 
+
+LOGFILE="/var/log/hostname.log"
+
+# Function to read the hostname from the DHCP lease file
+get_hostname() {
+    sudo cat /var/lib/dhcp/* | grep -a "option host-name" | tail -1 | \
+    awk -F '"' '{print $2}'
+}
+
+# Function to update /etc/hosts with the new hostname
+update_hosts() {
+    local hostname="$1"
+    # Replace the second line with the new hostname
+    sudo sed -i "2s/.*/127.0.1.1   ${hostname}/" /etc/hosts
+    echo "Updated /etc/hosts with hostname: $hostname" >> $LOGFILE
+}
+
+# Read the hostname from DHCP
+hostname=$(get_hostname)
+
+if [ -n "$hostname" ]; then
+    # Set the hostname using hostnamectl
+    sudo hostnamectl set-hostname "$hostname"
+    echo "Set hostname to: $hostname" >> $LOGFILE
+    update_hosts "$hostname"
+else
+    echo "No hostname found." >> $LOGFILE
+fi
+
+# Log completion
+echo "Hostname update script completed." >> $LOGFILE
+
+#  Version 1.0:
+#  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.

usr/bin/custom/watchdog

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# Log file
+log_file="/var/log/watchdog.log"
+
+# Extract watchdog IP addresses
+watchdog=$(sudo cat /var/lib/dhcp/* | grep -a "option watchdog" | tail -1 | \
+awk '{for (i=3; i<=NF; i++) printf "%s ", $i}' | tr -d '";')
+IFS=' ' read -r -a ip_array <<< "$watchdog"
+
+# Configuration file
+config_file="/etc/watchdog.conf"
+
+# Backup current configuration
+if sudo cp "$config_file" "$config_file.bak"; then
+    echo "Backup of $config_file created successfully." >> "$log_file"
+else
+    echo "Failed to create backup of $config_file." >> "$log_file"
+fi
+
+# Clean existing configurations
+sudo sed -i '/ping/d' "$config_file"
+sudo sed -i '/^interval/d' "$config_file"
+
+# Set interval
+echo "interval = 60" | sudo tee -a "$config_file" > /dev/null
+
+if [ ${#ip_array[@]} -eq 0 ]; then
+    echo "No IP addresses found. Watchdog configuration cleared." >> "$log_file"
+    sudo systemctl stop watchdog
+else
+    for ip in "${ip_array[@]}"; do
+        echo "ping = $ip" | sudo tee -a "$config_file" > /dev/null
+    done
+    echo "Configured watchdog to ping: ${ip_array[*]}" >> "$log_file"
+fi
+
+# Restart watchdog service
+if sudo systemctl restart watchdog; then
+    echo "Watchdog service restarted successfully." >> "$log_file"
+else
+    echo "Failed to restart watchdog service." >> "$log_file"
+fi
+
+#  Version 1.1:
+#  Created 2024 by Tim Eertmoed @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.

usr/bin/watchdog

@@ -1,22 +0,0 @@
-#!/bin/bash
-watchdog=$(sudo cat /var/lib/dhcp/* | grep -a "option watchdog" | tail -1 | \
-awk '{for (i=3; i<=NF; i++) printf "%s ", $i}' | tr -d '";')
-IFS=' ' read -r -a ip_array <<< "$watchdog"
-config_file="/etc/watchdog.conf"
-sudo cp "$config_file" "$config_file.bak"
-sudo sed -i '/ping/d' "$config_file"
-sudo sed -i '/^interval/d' "$config_file"
-echo "interval = 60" | sudo tee -a "$config_file" > /dev/null
-if [ ${#ip_array[@]} -eq 0 ]; then
-    sudo sed -i '/interval/d' "$config_file"
-    echo "No IP addresses found. Watchdog configuration cleared." >&2
-    sudo systemctl stop watchdog
-else
-    for ip in "${ip_array[@]}"; do
-        echo "ping = $ip" | sudo tee -a "$config_file" > /dev/null
-    done
-fi
-sudo systemctl restart watchdog
-
-#  Version 1.0:
-#  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.