From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>
Date: Fri, 9 May 2025 12:30:39 +0000 (+0200)
Subject: src/tests/lxc-test-apparmor-mount: prevent fail on cleanup path
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a13f86b07d40f406632f5c4da427e3378b768e5e;p=thirdparty%2Flxc.git

src/tests/lxc-test-apparmor-mount: prevent fail on cleanup path

/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>
---

diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index b8bedf07b..9b0a09b79 100755
--- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount
@@ -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