diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml index f85e77ff11c32d0738d6da7876f16843dc1ccdb5..66d440ff42fe60f91617858a5246cbd6362be3de 100644 --- a/apertis-ospack-basesdk.yaml +++ b/apertis-ospack-basesdk.yaml @@ -572,16 +572,6 @@ actions: chroot: true script: scripts/generate_locales.sh - - action: run - description: Switch the logind AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/lib.systemd.systemd-logind - - - action: run - description: Switch the Tracker AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.lib.tracker - # work around the Debos isssue in https://phabricator.apertis.org/T4308 - action: run chroot: false diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml index d1d0c9ed4da99721adcba1887d69ae9fa89a1cc8..de793dee28e8e57134888611d67f591a6c1d5435 100644 --- a/apertis-ospack-minimal.yaml +++ b/apertis-ospack-minimal.yaml @@ -171,26 +171,6 @@ actions: chroot: true script: scripts/generate_locales.sh - - action: run - description: Switch the logind AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/lib.systemd.systemd-logind - - - action: run - description: Switch the Canterbury AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.*.canterbury* - - - action: run - description: Switch the Ribchester AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.*.ribchester* - - - action: run - description: Switch the Newport AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.bin.newport - # work around the Debos isssue in https://phabricator.apertis.org/T4308 - action: run chroot: false diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml index 30b783dbd61c0df8c48345a1b41d557c2325c214..06c136ce539f019741726b2ca2e1af8dc06d16d1 100644 --- a/apertis-ospack-sdk.yaml +++ b/apertis-ospack-sdk.yaml @@ -750,41 +750,6 @@ actions: chroot: true script: scripts/generate_locales.sh - - action: run - description: Switch the logind AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/lib.systemd.systemd-logind - - - action: run - description: Switch the Canterbury AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.*.canterbury* - - - action: run - description: Switch the Ribchester AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.*.ribchester* - - - action: run - description: Switch the Newport AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.bin.newport - - - action: run - description: Switch the Rhosydd AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.bin.rhosydd - - - action: run - description: Switch the Tracker AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.lib.tracker - - - action: run - description: Switch the Frome AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.bin.frome - # work around the Debos isssue in https://phabricator.apertis.org/T4308 - action: run chroot: false diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml index 1e01e3ccea33e6e6dfcf88d069ce7232a1e20932..c68cbc67fd28ff34e9322fddd26523198805b459 100644 --- a/apertis-ospack-target.yaml +++ b/apertis-ospack-target.yaml @@ -286,43 +286,6 @@ actions: chroot: true script: scripts/generate_locales.sh - - action: run - description: Switch the logind AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/lib.systemd.systemd-logind - - {{ if eq $ivitools "enabled" }} - - action: run - description: Switch the Canterbury AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.*.canterbury* - - - action: run - description: Switch the Ribchester AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.*.ribchester* - - - action: run - description: Switch the Newport AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.bin.newport - - - action: run - description: Switch the Rhosydd AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.bin.rhosydd - {{ end }} - - - action: run - description: Switch the Tracker AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.lib.tracker - - - action: run - description: Switch the Frome AppArmor profile to complain mode - chroot: false - script: scripts/apparmor-profile-switch-to-complain.sh ${ROOTDIR}/etc/apparmor.d/usr.bin.frome - # work around the Debos isssue in https://phabricator.apertis.org/T4308 - action: run chroot: false diff --git a/scripts/apparmor-profile-switch-to-complain.sh b/scripts/apparmor-profile-switch-to-complain.sh deleted file mode 100755 index 8c8ad0809104fabf00eb57cc152ad5602afe5b16..0000000000000000000000000000000000000000 --- a/scripts/apparmor-profile-switch-to-complain.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -eu - -for ARG in "$@" -do - PROFILE=$(basename "$ARG") - echo "AppArmor: forcing profile $PROFILE in complain mode" - ln -s "../$PROFILE" "${ROOTDIR}/etc/apparmor.d/force-complain/" -done