From 7ebf4b8dff148eefdcf0730a069bd45569edc6e4 Mon Sep 17 00:00:00 2001 From: Andrea Terzolo Date: Mon, 30 Jan 2023 16:33:48 +0100 Subject: [PATCH] fix(scripts): revert part of `7a794b70a71896a3eb1971ca66cc0c19b9a104e6` Signed-off-by: Andrea Terzolo --- scripts/debian/postinst.in | 7 ++++++- scripts/rpm/postinstall.in | 7 ++++++- scripts/systemd/falco-bpf.service | 1 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/debian/postinst.in b/scripts/debian/postinst.in index 5ef75dc9..72bd5dd7 100755 --- a/scripts/debian/postinst.in +++ b/scripts/debian/postinst.in @@ -75,12 +75,17 @@ set -e echo "[POST-INSTALL] Trigger deamon-reload:" systemctl --system daemon-reload || true -# If needed, try to load/compile the driver through falco-driver-loader (only compile for kmod, that uses dkms) +# If needed, try to load/compile the driver through falco-driver-loader case "$chosen_driver" in "kmod") + # Only compile for kmod, in this way we use dkms echo "[POST-INSTALL] Call 'falco-driver-loader --compile module':" falco-driver-loader --compile module ;; + "bpf") + echo "[POST-INSTALL] Call 'falco-driver-loader bpf':" + falco-driver-loader bpf + ;; esac if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then diff --git a/scripts/rpm/postinstall.in b/scripts/rpm/postinstall.in index caed7a18..48974381 100755 --- a/scripts/rpm/postinstall.in +++ b/scripts/rpm/postinstall.in @@ -74,12 +74,17 @@ set -e echo "[POST-INSTALL] Trigger deamon-reload:" systemctl --system daemon-reload || true -# If needed, try to load/compile the driver through falco-driver-loader (only compile for kmod, that uses dkms) +# If needed, try to load/compile the driver through falco-driver-loader case "$chosen_driver" in "kmod") + # Only compile for kmod, in this way we use dkms echo "[POST-INSTALL] Call 'falco-driver-loader --compile module':" falco-driver-loader --compile module ;; + "bpf") + echo "[POST-INSTALL] Call 'falco-driver-loader bpf':" + falco-driver-loader bpf + ;; esac # validate rpm macros by `rpm -qp --scripts ` diff --git a/scripts/systemd/falco-bpf.service b/scripts/systemd/falco-bpf.service index fe833c76..e83ef6c9 100644 --- a/scripts/systemd/falco-bpf.service +++ b/scripts/systemd/falco-bpf.service @@ -8,7 +8,6 @@ Wants=falcoctl-artifact-follow.service Type=simple User=root Environment=FALCO_BPF_PROBE= -ExecStartPre=/usr/bin/falco-driver-loader bpf ExecStart=/usr/bin/falco --pidfile=/var/run/falco.pid UMask=0077 TimeoutSec=30