From 1e43ee29cd417f33d27d1a288fa336fdbb2406e3 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Mon, 9 Oct 2023 22:02:59 +0200 Subject: [PATCH] Move bpf mount to later on alpine (#475) --- packages/static/kairos-overlay-files/collection.yaml | 2 +- .../kairos-overlay-files/files/system/oem/00_rootfs.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml index 77b54e1..852831b 100644 --- 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 index 44118a0..80f8573 100644 --- 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