mask waits and attempt to fix repo inputs

joshschmelzle · Feb 1, 2025 · b160dc0 · b160dc0
1 parent 0e26f72
commit b160dc0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,9 +26,9 @@ jobs:
         run: |
           echo "Repos choice: $REPOS"
           if [ "$REPOS" = "both" ]; then
-            echo 'INCLUDE_PACKAGECLOUD_DEV=1' >> $GITHUB_OUTPUT
+            echo 'include_packagecloud_dev=1' >> $GITHUB_OUTPUT
           else
-            echo 'INCLUDE_PACKAGECLOUD_DEV=0' >> $GITHUB_OUTPUT
+            echo 'include_packagecloud_dev=0' >> $GITHUB_OUTPUT
           fi
   build-image:
     runs-on: ubuntu-24.04-arm
@@ -70,7 +70,7 @@ jobs:
         env:
           GITHUB_REF_NAME: ${{ github.ref_name }}
         run: |
-          sudo ./build.sh
+          sudo ./build.sh --include_packagecloud_dev=${{ needs.build-prep.outputs.include_packagecloud_dev }}
       - name: Get current date
         id: date
         run: echo "date=$(date -u +'%Y%m%dt%H%M%S')" >> $GITHUB_ENV

diff --git a/build.sh b/build.sh
@@ -1,5 +1,20 @@
 #!/bin/bash -e
 
+include_packagecloud_dev="${include_packagecloud_dev:-1}"
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --include_packagecloud_dev=*)
+            include_packagecloud_dev="${1#*=}"
+            shift
+            ;;
+        *)
+            echo "Unknown parameter: $1"
+            exit 1
+            ;;
+    esac
+done
+
 # shellcheck disable=SC2119
 run_sub_stage()
 {
@@ -184,7 +199,8 @@ export IMG_DATE="${IMG_DATE:-"$(date +%Y%m%d-%H%M%S)"}"
 export IMG_FILENAME="${IMG_FILENAME:-"${IMG_NAME}-${IMG_DATE}"}"
 export ARCHIVE_FILENAME="${ARCHIVE_FILENAME:-"${IMG_NAME}-${IMG_DATE}"}"
 
-export INCLUDE_PACKAGECLOUD_DEV=${INCLUDE_PACKAGECLOUD_DEV:-1}
+export INCLUDE_PACKAGECLOUD_DEV="${include_packagecloud_dev}"
+echo "INCLUDE_PACKAGECLOUD_DEV is ${include_packagecloud_dev}"
 
 export SCRIPT_DIR="${BASE_DIR}/scripts"
 export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_NAME}"}"

diff --git a/wlanpi0-base/02-net-tweaks/01-run.sh b/wlanpi0-base/02-net-tweaks/01-run.sh
@@ -25,5 +25,7 @@ fi
 
 on_chroot << EOF
 systemctl disable systemd-networkd-wait-online
+systemctl mask systemd-networkd-wait-online.service
 systemctl disable NetworkManager-wait-online.service
+systemctl mask NetworkManager-wait-online.service
 EOF