]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
lxc-test-unpriv: check user existence before removing it
authorPo-Hsu Lin <po-hsu.lin@canonical.com>
Wed, 22 Nov 2017 08:11:34 +0000 (03:11 -0500)
committerChristian Brauner <christian.brauner@ubuntu.com>
Sun, 17 Dec 2017 14:18:11 +0000 (15:18 +0100)
Check the test user (lxcunpriv) before calling deluser command,
otherwise it will print unnecessary error message:
/usr/sbin/deluser: The user 'lxcunpriv' does not exist.

Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
src/tests/lxc-test-unpriv

index bf40ebce384f5747442afc3054cc5ab9fa740f37..b8bddbac9a2cba05cbe9d9140b03189f6bbad677 100755 (executable)
@@ -105,7 +105,7 @@ fi
 trap cleanup EXIT SIGHUP SIGINT SIGTERM
 set -eu
 
-deluser $TUSER && rm -Rf $HDIR || true
+id $TUSER &> /dev/null && deluser -q --remove-home $TUSER
 useradd $TUSER
 
 mkdir -p $HDIR