Don't export PATH to guest vm

this fixes a bug where sbin isn't in the guest vm environment's path

2 files changed, 5 insertions, 2 deletions

diff --git a/lib/libktest.sh b/lib/libktest.sh
index 5573f3c..4cdc52d 100644
--- a/lib/libktest.sh
+++ b/lib/libktest.sh
@@ -286,6 +286,7 @@ start_vm()
     [[ $ktest_ssh_port = 0 ]] && start_networking
 
     local kernelargs=()
+    kernelargs+=(mitigations=off)
     kernelargs+=(console=hvc0)
     kernelargs+=(root=/dev/sda rw log_buf_len=8M)
     kernelargs+=("ktest.dir=$ktest_dir")
@@ -383,7 +384,7 @@ start_vm()
 	qemu_pmem mem-path="$file",size=$size
     done
 
-    set > "$ktest_tmp/env_tmp"
+    set |grep -v "^PATH=" > "$ktest_tmp/env_tmp"
     readonly_variables="$(readonly | cut -d= -f1 | cut -d' ' -f3)"
     for variable in ${readonly_variables}
     do
diff --git a/root_image b/root_image
index 0ce66c4..be75450 100755
--- a/root_image
+++ b/root_image
@@ -20,7 +20,7 @@ fi
 checkdep fallocate util-linux
 checkdep mkfs.ext4 e2fsprogs
 
-IMAGE_SIZE="4G"
+IMAGE_SIZE="10G"
 MIRROR=http://ftp.us.debian.org/debian/
 
 usage()
@@ -99,6 +99,8 @@ PACKAGES+=(libssl-dev libgdbm-dev libgdbm-compat-dev)
 # nfs testing:
 PACKAGES+=(nfs-kernel-server)
 
+PACKAGES+=(nbd-client)
+
 # dm testing:
 PACKAGES+=(cryptsetup)