1sttrixie (#2083)

* handle Wi-Fi in trixie like in bookworm
* Debian numbering cosmetics

Signed-off-by: Markus Storm <[email protected]>

* debug build

Signed-off-by: Markus Storm <[email protected]>

Author: mstormi

.github/workflows/build-action.yml

@@ -64,12 +64,12 @@ jobs:
            echo "image32=$(ls openhabian-raspios32-latest*.img.xz)" >> $GITHUB_OUTPUT
            echo "image64=$(ls openhabian-raspios64-latest*.img.xz)" >> $GITHUB_OUTPUT
            echo "json_image=$(ls rpi-imager-openhab.json)" >> $GITHUB_OUTPUT
-       - name: Archive openHABian 32bit Debian 12 trixie image
+       - name: Archive openHABian 32bit Debian 13 trixie image
          uses: actions/upload-artifact@v4
          with:
            name: ${{ steps.build.outputs.image32 }}
            path: ${{ steps.build.outputs.image32 }}
-       - name: Archive openHABian 64bit Debian 12 trixie image
+       - name: Archive openHABian 64bit Debian 13 trixie image
          uses: actions/upload-artifact@v4
          with:
            name: ${{ steps.build.outputs.image64 }}

build-image/first-boot.bash

@@ -105,12 +105,20 @@ wifiPassword="$wifi_password"
 if is_trixie || is_bookworm && is_pi; then	# attention no brackets => left-associative ordering so put && last
   echo -n "$(timestamp) [openHABian] Setting up NetworkManager and Wi-Fi connection... "
   systemctl enable --now NetworkManager
+  nmcli g
   nmcli r wifi on
+  nmcli g
+  nmcli r wifi on
+  nmcli g
 
   if [[ -n $wifiSSID ]]; then
     # Setup WiFi via NetworkManager
     # shellcheck source=/etc/openhabian.conf disable=SC2154
+    nmcli g
+    nmcli -w 30 d wifi connect "${wifiSSID}" password "${wifiPassword}" ifname wlan0
+    nmcli g
     nmcli -w 30 d wifi connect "${wifiSSID}" password "${wifiPassword}" ifname wlan0
+    nmcli g
   fi
 elif grep -qs "up" /sys/class/net/eth0/operstate; then
   # Actually check if ethernet is working

build-image/offline-install-modifications.bash

@@ -32,7 +32,7 @@ curl -fsSL https://pkgs.tailscale.com/stable/debian/bookworm.tailscale-keyring.l
 adoptium_fetch_apt
 
 apt-get --quiet update
-apt-get --quiet upgrade --yes --force-confnew
+apt-get --quiet upgrade --yes
 apt-get --quiet install --download-only --yes openhab openhab-addons \
   acl amanda-common amanda-server amanda-client apt-transport-https arping \
   avahi-daemon bash-completion bc bzip2 comitup coreutils curl \
@@ -41,7 +41,7 @@ apt-get --quiet install --download-only --yes openhab openhab-addons \
   libblas3 libc6 libcairo2 libgudev-1.0-0 libjs-jquery libmbim-glib4 libgpm2 \
   liblinear4 liblua5.4-0 libmbim-proxy \
   libmm-glib0 libndp0 libnet1 libnm0 libpcre2-32-0 \
-  libpixman-1-0 libqmi-glib5 libqmi-proxy libsodium23i libstdc++6 \
+  libpixman-1-0 libqmi-glib5 libqmi-proxy libstdc++6 \
   libteamdctl0 libxcb-render0 libxcb-shm0 libxrender1 libyascreen0 \
   make man-db mc mc-data mailcap mailutils modemmanager moreutils multitail \
   nano network-manager nmap nmap-common \
@@ -52,6 +52,8 @@ apt-get --quiet install --download-only --yes openhab openhab-addons \
   samba screen sysstat tailscale telnet temurin-21-jre usbutils util-linux \
   unzip vfu vfu-yascreen vim vim-runtime wget whiptail xz-utils zip zlib1g
 
+ls -l /var/cache/apt/archives/
+
 source /opt/openhabian/functions/nodejs-apps.bash
 nodejs_setup
 

build.bash

@@ -151,7 +151,8 @@ offline_install_modifications() {
     loopPrefix="$(kpartx -asv "$imageFile" | grep -oE "loop([0-9]+)" | head -n 1)"
     mount -o rw -t ext4 "/dev/mapper/${loopPrefix}p2" "$mountFolder"
     mount -o rw -t vfat "/dev/mapper/${loopPrefix}p1" "${mountFolder}/boot"
-    systemd-nspawn --directory="$2" /opt/openhabian/build-image/offline-install-modifications.bash &> /dev/null
+    systemd-nspawn --directory="$2" /opt/openhabian/build-image/offline-install-modifications.bash 
+    #systemd-nspawn --directory="$2" /opt/openhabian/build-image/offline-install-modifications.bash &> /dev/null
     sync
     df -h "$mountFolder"
     df -h "${mountFolder}/boot"