mainsail-crew · KwadFan · Jan 26, 2024 · Jan 26, 2024 · Feb 11, 2024 · Jun 8, 2024
diff --git a/config/armbian/bananapim2zero b/config/armbian/bananapim2zero
@@ -3,8 +3,8 @@
 # shellcheck enable=require-variable-braces
 
 # Image source
-DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-bananapi_m2_zero_bullseye.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-bananapi_m2_zero_bullseye.img.xz"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-bananapi_m2_zero_bookworm.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-bananapi_m2_zero_bookworm.img.xz"
 
 # export Variables
 export BASE_ARCH

diff --git a/config/armbian/default b/config/armbian/default
@@ -18,12 +18,12 @@ BASE_IMAGE_RASPBIAN="no"
 
 # partition resizing
 BASE_ROOT_PARTITION="2"
-BASE_IMAGE_ENLARGEROOT=2500
+BASE_IMAGE_ENLARGEROOT=3500
 BASE_IMAGE_RESIZEROOT=600
 # Compress not needed due compression done in workflow
 BASE_RELEASE_COMPRESS=no
 # Modules are valid for 32bit and 64bit images
-MODULES="base(pkgupgrade,udev_fix,armbian(armbian_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar))"
+MODULES="base(pkgupgrade,udev_fix,armbian(headless_nm,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar))"
 
 # export Variables
 export DOWNLOAD_BASE_URL

diff --git a/config/armbian/orangepi3lts b/config/armbian/orangepi3lts
@@ -5,8 +5,8 @@
 BASE_ARCH="arm64"
 
 # Image source
-DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-orangepi3_lts_bullseye.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-orangepi3_lts_bullseye.img.xz"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-orangepi3_lts_bookworm.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-orangepi3_lts_bookworm.img.xz"
 
 # export Variables
 export BASE_ARCH

diff --git a/config/armbian/orangepi4lts b/config/armbian/orangepi4lts
@@ -5,8 +5,8 @@
 BASE_ARCH="arm64"
 
 # Image source
-DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-orangepi4_lts_bullseye.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-orangepi4_lts_bullseye.img.xz"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-orangepi4_lts_bookworm.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-orangepi4_lts_bookworm.img.xz"
 
 # export Variables
 export BASE_ARCH

diff --git a/config/armbian/orangepi_zero2 b/config/armbian/orangepi_zero2
@@ -5,8 +5,8 @@
 BASE_ARCH="arm64"
 
 # Image source
-DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-orangepi_zero2_bullseye.img.xz.sha256"
-DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-orangepi_zero2_bullseye.img.xz"
+DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}/armbian-orangepi_zero2_bookworm.img.xz.sha256"
+DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}/armbian-orangepi_zero2_bookworm.img.xz"
 
 # export Variables
 export BASE_ARCH

diff --git a/config/orangepi/default b/config/orangepi/default
@@ -18,7 +18,7 @@ BASE_IMAGE_RASPBIAN="no"
 
 # partition resizing
 BASE_ROOT_PARTITION="2"
-BASE_IMAGE_ENLARGEROOT=2500
+BASE_IMAGE_ENLARGEROOT=3500
 BASE_IMAGE_RESIZEROOT=600
 # Compress not needed due compression done in workflow
 BASE_RELEASE_COMPRESS=no

diff --git a/config/raspberry/default b/config/raspberry/default
@@ -4,17 +4,15 @@
 # Declare Variables before exporting.
 # See https://www.shellcheck.net/wiki/SC2155
 
-# New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_arm64/images/raspios_oldstable_lite_arm64-2023-12-06/2023-12-05-raspios-bullseye-arm64-lite.img.xz"
-DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}.sha256"
-DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}.torrent"
-
-BASE_IMAGE_ENLARGEROOT=4500
+BASE_IMAGE_ENLARGEROOT=5500
 BASE_IMAGE_RESIZEROOT=600
 # Compress not needed due compression done in workflow
 BASE_RELEASE_COMPRESS=no
 # Modules are valid for 32bit and 64bit images
-MODULES="base(pkgupgrade,udev_fix,mainsailos(net,piconfig,klipper,is_req_preinstall,moonraker,timelapse,mainsail,crowsnest,sonar,password-for-sudo),postrename)"
+MODULES="base(pkgupgrade,udev_fix,mainsailos(headless_nm,piconfig,klipper,is_req_preinstall,moonraker,timelapse,mainsail,crowsnest,sonar,password-for-sudo),postrename)"
+
+DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.sha256"
+DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_arm64_latest.torrent"
 
 # export Variables
 export DOWNLOAD_BASE_URL

diff --git a/config/raspberry/rpi32 b/config/raspberry/rpi32
@@ -4,10 +4,8 @@
 # Declare Variables before exporting.
 # See https://www.shellcheck.net/wiki/SC2155
 
-# New locations after Bullseye turned into 'oldstable'
-DOWNLOAD_BASE_URL="https://downloads.raspberrypi.org/raspios_oldstable_lite_armhf/images/raspios_oldstable_lite_armhf-2023-12-06/2023-12-05-raspios-bullseye-armhf-lite.img.xz"
-DOWNLOAD_URL_CHECKSUM="${DOWNLOAD_BASE_URL}.sha256"
-DOWNLOAD_URL_IMAGE="${DOWNLOAD_BASE_URL}.torrent"
+DOWNLOAD_URL_CHECKSUM="https://downloads.raspberrypi.org/raspios_lite_armhf_latest.sha256"
+DOWNLOAD_URL_IMAGE="https://downloads.raspberrypi.org/raspios_lite_armhf_latest.torrent"
 
 export DOWNLOAD_BASE_URL
 export DOWNLOAD_URL_CHECKSUM

diff --git a/config/raspberry/rpi64 b/config/raspberry/rpi64
@@ -12,4 +12,4 @@ export BASE_ARCH
 ### JSON sniplet Setup
 ### NOTE: Please see all config files for setup variables!!!
 # shellcheck disable=SC2034
-JSON_SUPPORTED_SBC="pi3-64bit pi4-64bit"
+JSON_SUPPORTED_SBC="pi3-64bit pi4-64bit pi5-64bit"
diff --git a/config/raspberry/rpi64-ks b/config/raspberry/rpi64-ks
@@ -6,12 +6,15 @@
 
 BASE_ARCH="arm64"
 
+BASE_IMAGE_ENLARGEROOT=6500
+
 # Changed modules
-MODULES="base,pkgupgrade,udev_fix,mainsailos(net,piconfig,klipper,is_req_preinstall,moonraker,timelapse,mainsail,klipperscreen,crowsnest,sonar,password-for-sudo),postrename"
+MODULES="base(pkgupgrade,udev_fix,mainsailos(net,piconfig,klipper,is_req_preinstall,moonraker,timelapse,mainsail,klipperscreen,crowsnest,sonar,password-for-sudo),postrename)"
 
 # export variables
 export BASE_ARCH
 export MODULES
+export BASE_IMAGE_ENLARGEROOT
 
 ### JSON sniplet Setup
 ### NOTE: Please see all config files for setup variables!!!

diff --git a/src/modules/headless_nm/config b/src/modules/headless_nm/config
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#Shebang for better file detection
+#### headless_nm install module
+####
+#### Written by Stephan Wendel aka KwadFan <[email protected]>
+#### Copyright 2024 - till today
+#### https://github.com/mainsail-crew/MainsailOS
+####
+#### This File is distributed under GPLv3
+####
+
+# shellcheck disable=all
+
+# Use disable power save for wifi module
+[ -n "$HEADLESS_NM_DISABLE_PWRSAVE" ] || HEADLESS_NM_DISABLE_PWRSAVE=yes
+
+# Type of power save rclocal/service/udev
+# rclocal - backwards compatibility, runs via rc.local
+# service - will add an systemd.service to enable or disable behavior
+# on reboots
+# udev - creates a udev rules that should affect all wifi devices.
+
+[ -n "$HEADLESS_NM_PWRSAVE_TYPE" ] || HEADLESS_NM_PWRSAVE_TYPE=udev
diff --git a/src/modules/headless_nm/filesystem/boot/WiFi-README.txt b/src/modules/headless_nm/filesystem/boot/WiFi-README.txt
@@ -0,0 +1,59 @@
+Wifi-README.txt
+
+################################################################################
+####                           IMPORTANT WARNING                            ####
+################################################################################
+####                                                                        ####
+#### First, make sure you have a decent text editor of your choice.         ####
+#### Notepad++, VSCode, SublimeText or similar are recommended.             ####
+####                                                                        ####
+#### Do not use Wordpad to edit this file, it will corrupt it and your      ####
+#### configuration will not work.                                           ####
+####                                                                        ####
+#### If you use Textedit to edit this file,                                 ####
+#### be sure to use "plain text format" and "disable smart quotes"          ####
+#### in "Textedit > Preferences", otherwise Textedit will use               ####
+#### incompatible characters and your network configuration won't work!     ####
+####                                                                        ####
+################################################################################
+
+How do I setup a new network on my OS_NAME ?
+--------------------------------------------
+
+1.) Copy and paste the 'headless_nm.txt.template'.
+    Rename this file to 'headless_nm.txt'
+
+2.) Now open the file with your favourite text editor.
+    Windows and MacOS users please read the note above!
+
+    This file is pretty self explaining, just the 'REGDOMAIN'
+    needs some explaination:
+
+    Valid country codes are:
+
+        GB (United Kingdom)
+        FR (France)
+        DE (Germany)
+        US (United States)
+        SE (Sweden)
+
+    For a complete list, please visit https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+
+3.) Remove the SD card afterwards.
+
+4.) Almost done... Please put the SD card back into your SBC and wait for it to connect.
+
+NOTE:
+
+Plug in a monitor and watch the console output to get its IP address or
+consult your router's setup page to get this information.
+
+You could also try to reach it by its hostname.
+
+    http://<yourpisname>.local
+
+If you did not change the hostname during the initial flash, you could use
+
+    http://OS_NAME.local
+
+5.) Enjoy OS_NAME :)
diff --git a/src/modules/headless_nm/filesystem/boot/headless_nm.txt.template b/src/modules/headless_nm/filesystem/boot/headless_nm.txt.template
@@ -0,0 +1,14 @@
+#### Headless Wifi configuration
+
+# Your Wifis SSID
+SSID="<mySSID>"
+
+# Your WiFis password
+PASSWORD="<mySecretPasword>"
+
+# Is your SSID in hidden state? [true/false]
+HIDDEN="false"
+
+# Wifi Country code
+# See Wifi-README.txt for details!
+REGDOMAIN="US"
diff --git a/src/modules/headless_nm/filesystem/etc/systemd/system/disable-wifi-pwr-mgmt.service b/src/modules/headless_nm/filesystem/etc/systemd/system/disable-wifi-pwr-mgmt.service
@@ -0,0 +1,22 @@
+#### Disable wifi power_save
+####
+#### Written by Stephan Wendel aka KwadFan <[email protected]>
+#### Copyright 2022
+#### https://github.com/mainsail-crew/MainsailOS
+####
+#### This File is distributed under GPLv3
+####
+#### Note: This is based on:
+#### https://www.intel.com/content/www/us/en/support/articles/000006168/boards-and-kits.html
+
+[Unit]
+Description=Disable power management for wlan0
+After=network.target
+
+[Service]
+Type=oneshot
+StandardOutput=tty
+ExecStart=/usr/local/bin/pwrsave off
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/modules/headless_nm/filesystem/etc/systemd/system/headless_nm.service b/src/modules/headless_nm/filesystem/etc/systemd/system/headless_nm.service
@@ -0,0 +1,20 @@
+#### headless_nm service
+####
+#### Written by Stephan Wendel aka KwadFan <[email protected]>
+#### Copyright 2024
+#### https://github.com/mainsail-crew/MainsailOS
+####
+#### This File is distributed under GPLv3
+####
+
+[Unit]
+Description=Setup Wifi on headless machines using NetworkManager
+Before=network.target NetworkManager.service
+
+[Service]
+Type=oneshot
+StandardOutput=tty
+ExecStart=/usr/local/bin/headless_nm
+
+[Install]
+WantedBy=multi-user.target
diff --git a/src/modules/headless_nm/filesystem/etc/udev/rules.d/070-wifi-powersave.rules b/src/modules/headless_nm/filesystem/etc/udev/rules.d/070-wifi-powersave.rules
@@ -0,0 +1,4 @@
+ACTION=="add", \
+SUBSYSTEM=="net", \
+KERNEL=="wlan*" \
+RUN+="/usr/sbin/iw %k set power_save off"