From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 2 Oct 2014 18:59:35 +0000 (-0400)
Subject: tests: Fix unpriv test
X-Git-Tag: lxc-1.1.0.alpha3~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ba5eb93b8eeb82fbfb42e33324513d70e777dd5;p=thirdparty%2Flxc.git

tests: Fix unpriv test

Don't use $TUSER as it's not defined. Also don't include
lxc-test-usernic in extra_DIST.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 9840aa301..495f1cfcb 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -81,7 +81,6 @@ EXTRA_DIST = \
 	lxc-test-cloneconfig \
 	lxc-test-ubuntu \
 	lxc-test-unpriv \
-	lxc-test-usernic \
 	may_control.c \
 	saveconfig.c \
 	shutdowntest.c \
diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 8d78fea59..75dd9844c 100755
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -85,9 +85,9 @@ lxc.id_map = g 0 910000 10000
 EOF
 
 if which cgm >/dev/null 2>&1; then
-	cgm create all $TUSER
-	cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER)
-	cgm movepid all $TUSER $$
+	cgm create all usernic-user
+	cgm chown all usernic-user $(id -u usernic-user) $(id -g usernic-user)
+	cgm movepid all usernic-user $$
 elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
 	for d in $(cut -d : -f 2 /proc/self/cgroup); do
 		dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \