Skip to content

L
lxc
Commit 8ac62e20 by Stéphane Graber
Options

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: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent d9bae9c8
Showing with 3 additions and 4 deletions
src/tests/Makefile.am
...@@ -73,7 +73,6 @@ EXTRA_DIST = \ ...@@ -73,7 +73,6 @@ EXTRA_DIST = \
lxc-test-autostart \ lxc-test-autostart \
lxc-test-ubuntu \ lxc-test-ubuntu \
lxc-test-unpriv \ lxc-test-unpriv \
lxc-test-usernic \
may_control.c \ may_control.c \
saveconfig.c \ saveconfig.c \
shutdowntest.c \ shutdowntest.c \
......
src/tests/lxc-test-usernic.in
...@@ -85,9 +85,9 @@ lxc.id_map = g 0 910000 10000 ...@@ -85,9 +85,9 @@ lxc.id_map = g 0 910000 10000
EOF EOF
if which cgm >/dev/null 2>&1; then if which cgm >/dev/null 2>&1; then
cgm create all $TUSER cgm create all usernic-user
cgm chown all $TUSER $(id -u $TUSER) $(id -g $TUSER) cgm chown all usernic-user $(id -u usernic-user) $(id -g usernic-user)
cgm movepid all $TUSER $$ cgm movepid all usernic-user $$
elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then elif [ -e /sys/fs/cgroup/cgmanager/sock ]; then
for d in $(cut -d : -f 2 /proc/self/cgroup); do for d in $(cut -d : -f 2 /proc/self/cgroup); do
dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \ dbus-send --print-reply --address=unix:path=/sys/fs/cgroup/cgmanager/sock \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment