]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
src/tests/lxc-test-apparmor-mount: prevent fail on cleanup path
authorAlexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Fri, 9 May 2025 12:30:39 +0000 (14:30 +0200)
committerAlexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Fri, 9 May 2025 13:39:17 +0000 (15:39 +0200)
/run/user/$(id -u $TUSER) is a mountpoint for tmpfs, rm -rf
may fail with EBUSY errno. We should mask it and prevent test from marked
as failed because of this.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
src/tests/lxc-test-apparmor-mount

index b8bedf07b981c561c59f0926cae50a37fa9e299d..9b0a09b7931238b56e598f299793787d80709bea 100755 (executable)
@@ -50,7 +50,7 @@ cleanup() {
        pkill -u $(id -u $TUSER) -9 || true
        sed -i '/lxcunpriv/d' /run/lxc/nics /etc/lxc/lxc-usernet
        sed -i '/^lxcunpriv:/d' /etc/subuid /etc/subgid
-       rm -Rf $HDIR /run/user/$(id -u $TUSER)
+       rm -Rf $HDIR /run/user/$(id -u $TUSER) || true
        deluser $TUSER
        if [ $DONE -eq 0 ]; then
                echo 'Failed container log:' >&2