Commit 628b1258 authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov

zdtm.py: check restore when criu dump runs over a non-root user

Signed-off-by: 's avatarAndrew Vagin <avagin@virtuozzo.com>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent de76a07e
...@@ -3,4 +3,4 @@ set -e ...@@ -3,4 +3,4 @@ set -e
source `dirname $0`/criu-lib.sh source `dirname $0`/criu-lib.sh
prep prep
mount_tmpfs_to_dump mount_tmpfs_to_dump
./test/zdtm.py run --all --keep-going --report report --parallel 4 --user --norst -x 'maps04' || fail ./test/zdtm.py run --all --keep-going --report report --parallel 4 --user -x 'maps04' || fail
...@@ -714,7 +714,10 @@ class criu_cli: ...@@ -714,7 +714,10 @@ class criu_cli:
if self.__script: if self.__script:
s_args += ['--action-script', self.__script] s_args += ['--action-script', self.__script]
preexec = self.__user and self.set_user_id or None if action == "restore":
preexec = None
else:
preexec = self.__user and self.set_user_id or None
__ddir = self.__ddir() __ddir = self.__ddir()
......
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