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>
This commit is contained in:
Stéphane Graber 2014-10-02 14:59:35 -04:00
parent e356822da4
commit 2ba5eb93b8
No known key found for this signature in database
GPG Key ID: C638974D64792D67
2 changed files with 3 additions and 4 deletions

View File

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

View File

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