fix: fix wifi connectivity (#240)

* fix: reenable package upgrades Signed-off-by: Stephan Wendel <[email protected]> * fix: fix missing packages for network_configurator Signed-off-by: Stephan Wendel <[email protected]> --------- Signed-off-by: Stephan Wendel <[email protected]>
mainsail-crew · Sep 29, 2023 · 55b253e · 55b253e
1 parent f02179d
commit 55b253e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/config/armbian/default b/config/armbian/default
@@ -23,7 +23,7 @@ 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,udev_fix,armbian(armbian_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar)"
+MODULES="base,pkgupgrade,udev_fix,armbian(armbian_net,mainsailos,klipper,is_req_preinstall,moonraker,mainsail,timelapse,crowsnest,sonar)"
 
 # export Variables
 export DOWNLOAD_BASE_URL

diff --git a/src/modules/armbian_net/config b/src/modules/armbian_net/config
@@ -14,3 +14,4 @@
 [[ -n "$ARMBIAN_NET_FIRSTRUN_FILE" ]] || ARMBIAN_NET_FIRSTRUN_FILE="/boot/armbian_first_run.txt.template"
 [[ -n "$ARMBIAN_NET_FIRSTRUN_SCRIPT" ]] || ARMBIAN_NET_FIRSTRUN_SCRIPT="/usr/lib/armbian/armbian-firstrun-config"
 [[ -n "$ARMBIAN_NET_NC_PATH" ]] || ARMBIAN_NET_NC_PATH="/usr/local/bin/network-configurator"
+[[ -n "$ARMBIAN_NET_DEPS" ]] || ARMBIAN_NET_DEPS="net-tools"
diff --git a/src/modules/armbian_net/start_chroot_script b/src/modules/armbian_net/start_chroot_script
@@ -28,6 +28,11 @@ install_cleanup_trap
 unpack filesystem/root / root
 ## END
 
+## Step 1.1: Install Depedencies
+### Needed to patch 'network_configurator'
+# shellcheck disable=SC2086
+check_install_pkgs ${ARMBIAN_NET_DEPS}
+
 ## Step 2: remove original template
 if [[ -f "${ARMBIAN_NET_FIRSTRUN_FILE}" ]]; then
     sudo rm -rf "${ARMBIAN_NET_FIRSTRUN_FILE}"