diff --git a/steps/improve/make_bootable.sh b/steps/improve/make_bootable.sh
index acb760a..794011b 100644
--- a/steps/improve/make_bootable.sh
+++ b/steps/improve/make_bootable.sh
@@ -28,7 +28,7 @@ menuentry 'Linux live-bootstrap' {
     insmod part_msdos
     set root='$(grub-probe -d /dev/${DISK} -t bios_hints | sed -e 's/ //g')'
     set gfxpayload=auto
-    linux /boot/vmlinuz root=/dev/${DISK} rw $(cat /proc/cmdline)
+    linux /boot/vmlinuz root=/dev/${DISK} rootwait rw $(cat /proc/cmdline)
 }
 EOF
 
diff --git a/steps/jump/linux.sh b/steps/jump/linux.sh
index 568834b..da2d616 100755
--- a/steps/jump/linux.sh
+++ b/steps/jump/linux.sh
@@ -23,10 +23,10 @@ else
     # kexec time
     if [ "${BARE_METAL}" = True ]; then
         kexec -l "/boot/vmlinuz" \
-            --append="root=/dev/sda1 rootfstype=ext3 init=/init rw"
+            --append="root=/dev/sda1 rootfstype=ext3 init=/init rw rootwait"
     else
         kexec -l "/boot/vmlinuz" --console-serial \
-            --append="console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw"
+            --append="console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw rootwait"
     fi
     kexec -e
 fi