From a9b343f4805642a76d060608fa6b6121c2140dfd Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Fri, 9 May 2025 14:32:55 +0200 Subject: [PATCH] src/tests/lxc-test-unpriv: 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. Also add set -x to make debugging easier in case of failures. Signed-off-by: Alexander Mikhalitsyn --- src/tests/lxc-test-unpriv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv index 8abc3e0ad..579e30a95 100755 --- a/src/tests/lxc-test-unpriv +++ b/src/tests/lxc-test-unpriv @@ -66,7 +66,7 @@ cleanup() { 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 @@ -90,7 +90,7 @@ TUSER=lxcunpriv HDIR=/home/$TUSER trap cleanup EXIT SIGHUP SIGINT SIGTERM -set -eu +set -eux id $TUSER &> /dev/null && deluser -q --remove-home $TUSER useradd $TUSER -- 2.47.2