diff --git a/test/zdtm.sh b/test/zdtm.sh index d55a92ccf..3dee9d643 100755 --- a/test/zdtm.sh +++ b/test/zdtm.sh @@ -204,6 +204,8 @@ generate_test_list() " TEST_MNTNS=" + ns/static/mnt_ext_auto + ns/static/mnt_ext_master ns/static/mntns_open ns/static/mntns_link_remap ns/static/mntns_link_ghost @@ -560,9 +562,11 @@ start_test() return 1 fi - mount --make-private "$ZDTM_ROOT" - umount -l "$ZDTM_ROOT" - mount --make-private --bind . $ZDTM_ROOT || return 1 + if [ -n "$ZDTM_ROOT" ]; then + mount --make-private "$ZDTM_ROOT" + umount -l "$ZDTM_ROOT" + mount --make-private --bind . $ZDTM_ROOT || return 1 + fi } stop_test() diff --git a/test/zdtm/.gitignore b/test/zdtm/.gitignore index aee6b9ec6..860cf415c 100644 --- a/test/zdtm/.gitignore +++ b/test/zdtm/.gitignore @@ -60,6 +60,8 @@ /live/static/maps_file_prot /live/static/mem-touch /live/static/mmx00 +/live/static/mnt_ext_auto +/live/static/mnt_ext_master /live/static/mntns_link_ghost /live/static/mntns_link_remap /live/static/mntns_open