Move bpf mount to later on alpine (#475)

kairos-io · Oct 9, 2023 · 1e43ee2 · 1e43ee2
1 parent 6cbcce9
commit 1e43ee2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml
@@ -1,4 +1,4 @@
 packages:
   - name: "kairos-overlay-files"
     category: "static"
-    version: "1.1.0"
+    version: "1.1.1"
diff --git a/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml b/packages/static/kairos-overlay-files/files/system/oem/00_rootfs.yaml
@@ -8,10 +8,6 @@
 name: "Rootfs Layout Settings"
 stages:
   rootfs:
-    - name: "Mount BPF on Alpine systems"
-      if: '[ ! -e "/sbin/systemctl" ] && [ ! -e "/usr/bin/systemctl" ] && [ ! -e "/usr/sbin/systemctl" ] && [ ! -e "/usr/bin/systemctl" ]'
-      commands:
-        - mount bpffs -o rw,nosuid,nodev,noexec,relatime,mode=700 /sys/fs/bpf -t bpf
     - if: '[ ! -f "/run/cos/recovery_mode" ] && [ ! -e "/run/cos/uki_boot_mode" ] && [ ! -e "/run/cos/uki_install_mode" ]'
       name: "Layout configuration for active/passive mode"
       environment_file: /run/cos/cos-layout.env
@@ -155,3 +151,7 @@ stages:
       if: "[[ $(kairos-agent state get kairos.flavor) =~ ^alpine ]]"
       commands:
         - mount --make-rshared /
+    - name: "Mount BPF on Alpine systems"
+      if: "[[ $(kairos-agent state get kairos.flavor) =~ ^alpine ]]"
+      commands:
+        - mount bpffs -o rw,nosuid,nodev,noexec,relatime,mode=700 /sys/fs/bpf -t bpf