Commit 1f97db8a authored by Andrew Vagin's avatar Andrew Vagin Committed by Pavel Emelyanov

other/overlayfs: don't use the shell-job option

Jenkins runs all tests in a new session without a control terminal.
Signed-off-by: 's avatarAndrew Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 80866756
...@@ -3,4 +3,4 @@ run: ...@@ -3,4 +3,4 @@ run:
clean: clean:
umount -f overlay_test/z umount -f overlay_test/z
rm -rf overlay_test rm -rf overlay_test output checkpoint
...@@ -6,7 +6,7 @@ CRIU=../../../criu ...@@ -6,7 +6,7 @@ CRIU=../../../criu
setup() { setup() {
setup_mount setup_mount
sleep 10 3>z/file & setsid sleep 10 3>z/file < /dev/null &> output &
PROC_PID=$! PROC_PID=$!
echo "PROC_PID=$PROC_PID" echo "PROC_PID=$PROC_PID"
sleep 1 sleep 1
...@@ -21,13 +21,13 @@ setup_mount() { ...@@ -21,13 +21,13 @@ setup_mount() {
check_criu() { check_criu() {
echo "Dumping $PROC_PID..." echo "Dumping $PROC_PID..."
if ! $CRIU dump -D checkpoint --shell-job -t "${PROC_PID}"; then if ! $CRIU dump -D checkpoint -t "${PROC_PID}"; then
echo "ERROR! dump failed" echo "ERROR! dump failed"
return 1 return 1
fi fi
echo "Restoring..." echo "Restoring..."
if ! $CRIU restore -d -D checkpoint --shell-job; then if ! $CRIU restore -d -D checkpoint; then
echo "ERROR! restore failed" echo "ERROR! restore failed"
return 1 return 1
fi fi
......
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