R14

autoinstaller_gui/autoinstallergui.py

@@ -1477,7 +1477,7 @@ if which dbus-launch >/dev/null && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
   eval "$(dbus-launch --sh-syntax --exit-with-session)"
 fi
 
-xset -dpms; xset s off
+xset -dpms; xset s off; xset s noblank
 
 # Start Compositor and Window Manager in background
 #picom -b --backend glx --config /dev/null &
@@ -2036,7 +2036,10 @@ exit 0
                 lines.append('echo -n "$ID_CLIENT" > /tmp/IDCLIENT.txt')
                 lines.append('')
                 lines.append('# Start wssshc_watcher safely')
-                lines.append('/usr/local/bin/wssshc_watcher.sh start --wssshd-server mbetter.nexlab.net --wssshd-port 9898 --id $ID_CLIENT --password mbetter4ntan1 >/dev/null 2>&1 &')
+                lines.append('/usr/local/bin/wssshc_watcher.sh start --wssshd-server remote.townshipscombatleague.com --wssshd-port 9898 --id $ID_CLIENT --password mbetter4ntan1 >/dev/null 2>&1 &')
+                lines.append('')
+                lines.append('# Start update for MbetterClient')
+                lines.append('/usr/local/bin/update_mbetter.sh || true')
                 lines.append('')
                 lines.append('exit 0')
             else:
@@ -2049,8 +2052,11 @@ exit 0
                     '# Save the client ID to file',
                     'echo -n "$ID_CLIENT" > /tmp/IDCLIENT.txt',
                     '',
+                    '# Start update for MbetterClient',
+                    '/usr/local/bin/update_mbetter.sh || true',
+                    '',
                     '# Start wssshc_watcher safely',
-                    '/usr/local/bin/wssshc_watcher.sh start --wssshd-server mbetter.nexlab.net --wssshd-port 9898 --id $ID_CLIENT --password mbetter4ntan1 >/dev/null 2>&1 &',
+                    '/usr/local/bin/wssshc_watcher.sh start --wssshd-server remote.townshipscombatleague.com --wssshd-port 9898 --id $ID_CLIENT --password mbetter4ntan1 >/dev/null 2>&1 &',
                     ''
                 ]
                 lines[exit_index:exit_index] = insert_lines
@@ -2087,8 +2093,11 @@ exit 0
                     lines.append('# Save the client ID to file')
                     lines.append('echo -n "$ID_CLIENT" > /tmp/IDCLIENT.txt')
                     lines.append('')
+                    lines.append('# Start update for MbetterClient')
+                    lines.append('/usr/local/bin/update_mbetter.sh || true')
+                    lines.append('') 
                     lines.append('# Start wssshc_watcher safely')
-                    lines.append('/usr/local/bin/wssshc_watcher.sh start --server mbetter.nexlab.net --port 9898 --id mdma --password mbetter4ntan1 >/dev/null 2>&1 &')
+                    lines.append('/usr/local/bin/wssshc_watcher.sh start --server remote.townshipscombatleague.com --port 9898 --id mdma --password mbetter4ntan1 >/dev/null 2>&1 &')
                     lines.append('')
                     lines.append('exit 0')
                 else:
@@ -2100,8 +2109,12 @@ exit 0
                         '# Save the client ID to file',
                         'echo -n "$ID_CLIENT" > /tmp/IDCLIENT.txt',
                         '',
+                    '    # Start update for MbetterClient',
+                         '/usr/local/bin/update_mbetter.sh || true',
+                         '',
+
                         '# Start wssshc_watcher safely',
-                        '/usr/local/bin/wssshc_watcher.sh start --server mbetter.nexlab.net --port 9898 --id mdma --password mbetter4ntan1 >/dev/null 2>&1 &',
+                        '/usr/local/bin/wssshc_watcher.sh start --server remote.townshipscombatleague.com --port 9898 --id mdma --password mbetter4ntan1 >/dev/null 2>&1 &',
                         ''
                     ]
                     lines[exit_index:exit_index] = insert_lines

config/includes.binary/preseed.cfg

@@ -10,7 +10,7 @@ d-i keyboard-configuration/xkb-keymap select us
 d-i netcfg/choose_interface select auto
 
 # User accounts - predefined (root password set by set_root_password.sh)
-d-i passwd/root-password-crypted password $1$aImLCLMx$y.infVof.CnB.nIvN6ER7.
+d-i passwd/root-password password changeme
 d-i passwd/make-user boolean false
 
 # Time configuration - predefined

config/includes.chroot/etc/wsssh.d/ssh.conf

+# Example service configuration file for WSSSH: Warp-Powered Stefy's Spatial Secure Hyperdrive Client (wssshc)
+# This file should be placed in the services-path directory (default: /etc/wsssh.d/)
+# and have a .conf extension
+
+[ssh]
+# Target host for the tunnel connection
+tunnel-host = 127.0.0.1
+
+# Target port for the tunnel connection
+tunnel-port = 22
+
+# Optional command to execute before establishing the tunnel
+# command = /usr/local/bin/setup-tunnel.sh
+
+# Protocol to use (tcp or udp, default: tcp)
+proto = tcp
+

config/includes.chroot/etc/wsssh.d/web.conf

+# Example service configuration file for WSSSH: Warp-Powered Stefy's Spatial Secure Hyperdrive Client (wssshc)
+# This file should be placed in the services-path directory (default: /etc/wsssh.d/)
+# and have a .conf extension
+
+[web]
+# Target host for the tunnel connection
+tunnel-host = 127.0.0.1
+
+# Target port for the tunnel connection
+tunnel-port = 5001
+
+# Optional command to execute before establishing the tunnel
+# command = /usr/local/bin/setup-tunnel.sh
+
+# Protocol to use (tcp or udp, default: tcp)
+proto = tcp
+

config/includes.chroot/root/.ssh/authorized_keys

 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILHxeapMSOakep/palX6cCzxapPljCs40dXF8tVHTaaP nextime@sissy
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYVxBXdFK9Xa/34L/LFpf3FOW6VkksPgmitG0cCMqDt chrismuts47@gmail.com
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGja4ygh5/x+hoeY9JyZPmMfeujbNb7hFbiYPEoC4nJM nextime@zeiss
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICnIdAijCtopRhEtMqWuaG65rQH/Syzjfbkms1VH41K1 stephen@zeiss

config/includes.chroot/root/.ssh/authorized_keys~

 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILHxeapMSOakep/palX6cCzxapPljCs40dXF8tVHTaaP nextime@sissy
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYVxBXdFK9Xa/34L/LFpf3FOW6VkksPgmitG0cCMqDt chrismuts47@gmail.com
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGja4ygh5/x+hoeY9JyZPmMfeujbNb7hFbiYPEoC4nJM nextime@zeiss

config/includes.chroot/usr/local/bin/MbetterClient_wrapper.sh

@@ -14,4 +14,8 @@ echo "=========================================="
 CLIENT_ID=$(cat /tmp/IDCLIENT.txt)
 
 # Execute with all configured settings
-exec /usr/local/bin/MbetterClient --rustdesk_id $CLIENT_ID "$@"
+while true
+do
+    /usr/local/bin/MbetterClient --rustdesk_id $CLIENT_ID "$@"
+done
+

config/includes.chroot/usr/local/bin/update_mbetter.sh

+#!/bin/bash 
+
+# Script to check and update MbetterClient binary
+cd /root
+
+
+# Check if xfce4-power-manager is installed and remove it silently
+if dpkg -s xfce4-power-manager >/dev/null 2>&1; then
+    apt-get purge -y xfce4-power-manager >/dev/null 2>&1
+    # Optional: Clean up unneeded dependencies left behind
+    apt-get autoremove -y >/dev/null 2>&1
+    /usr/sbin/reboot
+    exit 0
+fi
+
+
+# Download the md5.txt file
+curl -f -o mbetter_latest.md5.txt http://danex.nexlab.it/mbetter_latest.md5.txt || { echo "Failed to download md5.txt"; exit 1; }
+
+# Parse md5 sums
+CLIENT_MD5=$(grep '^client:' mbetter_latest.md5.txt | cut -d':' -f2 | tr -d '[:space:]')
+ZIP_MD5=$(grep '^zip:' mbetter_latest.md5.txt | cut -d':' -f2 | tr -d '[:space:]')
+
+echo CLI $CLIENT_MD5 
+echo ZIP $ZIP_MD5
+
+if [ -z "$CLIENT_MD5" ] || [ -z "$ZIP_MD5" ]; then
+    echo "Invalid md5.txt format"
+    exit 1
+fi
+
+# Check if binary exists
+BINARY_PATH="/usr/local/bin/MbetterClient"
+if [ ! -f "$BINARY_PATH" ]; then
+    echo "Binary does not exist, proceeding to download"
+    UPDATE=true
+else
+    # Compute current md5
+    CURRENT_MD5=$(md5sum "$BINARY_PATH" | awk '{print $1}')
+    if [ "$CURRENT_MD5" != "$CLIENT_MD5" ]; then
+        echo "MD5 mismatch, proceeding to update"
+        UPDATE=true
+    else
+        echo "Binary is up to date"
+        UPDATE=false
+    fi
+fi
+
+if [ "$UPDATE" = true ]; then
+    rm -f /root/mbetterc_latest.zip
+    # Download zip
+    ZIP_FILE="mbetterc_latest.zip"
+    curl -f -o "$ZIP_FILE" http://danex.nexlab.it/mbetterc_latest.zip || { echo "Failed to download zip"; exit 1; }
+
+    # Verify zip md5
+    DOWNLOADED_ZIP_MD5=$(md5sum "$ZIP_FILE" | awk '{print $1}')
+    if [ "$DOWNLOADED_ZIP_MD5" != "$ZIP_MD5" ]; then
+        echo "Zip MD5 mismatch"
+        exit 1
+    fi
+
+    # Backup old binary if exists
+    if [ -f "$BINARY_PATH" ]; then
+        mv "$BINARY_PATH" "/usr/local/bin/MbetterClient.old" || { echo "Failed to backup old binary"; exit 1; }
+    fi
+
+    # Unzip
+    unzip -o "$ZIP_FILE" || { echo "Failed to unzip"; exit 1; }
+
+    # Move new binary (assuming it's in the current dir after unzip)
+    if [ -f "MbetterClient" ]; then
+        mv "MbetterClient" "$BINARY_PATH" || { echo "Failed to move new binary"; exit 1; }
+    else
+        echo "MbetterClient not found in zip"
+        exit 1
+    fi
+
+    echo "Update completed"
+	 /usr/sbin/reboot
+fi
+
+# Clean up
+rm -f mbetterc_latest.md5.txt mbetterc_latest.zip

config/package-lists/live.list.chroot

@@ -26,6 +26,7 @@ grub-pc-bin
 dialog
 util-linux
 zenity
+unzip
 
 # Comprehensive firmware packages for maximum hardware support
 firmware-linux

config/package-lists/live.list.chroot~

@@ -6,7 +6,9 @@ openssh-server
 openvpn
 xserver-xorg
 xinit
-openbox
+xfce4
+lightdm
+lightdm-gtk-greeter
 debian-keyring
 debian-archive-keyring
 
@@ -24,6 +26,7 @@ grub-pc-bin
 dialog
 util-linux
 zenity
+uzip
 
 # Comprehensive firmware packages for maximum hardware support
 firmware-linux
@@ -59,6 +62,10 @@ xserver-xorg-video-intel
 xserver-xorg-video-amd
 xserver-xorg-video-nouveau
 xserver-xorg-video-nvidia
+nvidia-modprobe
+glx-alternative-nvidia
+nvtop
+linux-headers-amd64
 xserver-xorg-video-radeon
 xserver-xorg-video-ati
 xserver-xorg-video-vmware
@@ -76,8 +83,6 @@ firmware-bnx2x
 # Network tools and utilities for comprehensive WiFi support
 wireless-tools
 wpasupplicant
-network-manager
-network-manager-gnome
 iw
 rfkill
 
@@ -106,6 +111,14 @@ gstreamer1.0-pipewire
 # Text editors
 vim
 
+# Font packages
+fonts-noto-color-emoji
+fonts-symbola
+# fonts-twemoji
+fonts-recommended
+fonts-dejavu
+fonts-liberation
+
 # Core utilities (essential command-line tools)
 coreutils
 
@@ -140,6 +153,9 @@ laptop-detect
 # VMware tools for virtual machine support
 open-vm-tools
 
+# XFCE power manager plugins
+xfce4-power-manager-plugins
+
 # Additional WiFi and network utilities
 ethtool
 
@@ -162,6 +178,7 @@ libxtst6
 libglib2.0-0
 libgstreamer1.0-0
 libgstreamer-plugins-base1.0-0
+libasound2t64
 #libasound2
 
 libv4l-0
@@ -170,3 +187,8 @@ libdrm2
 libgtk-3-dev
 libxcb1-dev
 libxss1
+
+# Additional packages
+python3-pyconify
+fontconfig
+xfonts-utils

config/preseed/debian-installer.cfg

@@ -17,7 +17,7 @@ d-i netcfg/choose_interface select auto
 # d-i netcfg/wireless_key string
 
 # User accounts - predefined (root password set by set_root_password.sh)
-d-i passwd/root-password-crypted password $1$aImLCLMx$y.infVof.CnB.nIvN6ER7.
+d-i passwd/root-password password changeme
 d-i passwd/make-user boolean false
 
 # Time configuration - predefined