Merge branch 'after' into bare-metal-full

steps/improve/after.sh

@@ -14,7 +14,11 @@ if [ "${INTERACTIVE}" = True ]; then
 fi
 
 if [ "${CHROOT}" = False ]; then
+    # ignore errors due to fstab or swapfile not existing
+    swapoff -a &> /dev/null || true
     sync
+    # sysrq to avoid device busy; then mount to wait for it to finish
+    echo u > /proc/sysrq_trigger
     mount -o remount,ro /
     echo o > /proc/sysrq_trigger # power off
 fi

steps/jump/move_disk.sh

@@ -43,5 +43,6 @@ mkdir -p /rootonly
 # This doesn't recursively mount - that's why we're able to copy everything over
 mount --bind / /rootonly
 cp -ar /rootonly/* /newroot/
+sed -e 's/newroot//' /rootonly/etc/mtab | grep -v 'rootonly' > /newroot/etc/mtab
 umount /rootonly
 switch_root /newroot /init