From: Po-Hsu Lin <po-hsu.lin@canonical.com>
Date: Wed, 22 Nov 2017 08:11:34 +0000 (-0500)
Subject: lxc-test-unpriv: check user existence before removing it
X-Git-Tag: lxc-2.0.10~568
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c55bcc7cc95c1e1ad87e0bb9d8367de0c7526b4c;p=thirdparty%2Flxc.git

lxc-test-unpriv: check user existence before removing it

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

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index bf40ebce3..b8bddbac9 100755
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -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