From 55b253e959572ac9722c21c5902b18e531089e2b Mon Sep 17 00:00:00 2001 From: Stephan Wendel <43513802+KwadFan@users.noreply.github.com> Date: Fri, 29 Sep 2023 19:31:29 +0200 Subject: [PATCH] fix: fix wifi connectivity (#240) * fix: reenable package upgrades Signed-off-by: Stephan Wendel * fix: fix missing packages for network_configurator Signed-off-by: Stephan Wendel --------- Signed-off-by: Stephan Wendel --- config/armbian/default | 2 +- src/modules/armbian_net/config | 1 + src/modules/armbian_net/start_chroot_script | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/armbian/default b/config/armbian/default index f05c136fa..bd7d28436 100644 --- 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 index d9a9ffa1e..d2b005768 100644 --- 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 index 997425bd5..7a3a152f0 100644 --- 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}"