diff --git a/rootfs.py b/rootfs.py index 143eafc7..fac39c2d 100755 --- a/rootfs.py +++ b/rootfs.py @@ -830,9 +830,9 @@ def _qemu_arg_list_for_kernel(args, generator, target, size): '-append', ] if args.interactive: - arg_list += ['consoleblank=0 earlyprintk=vga root=/dev/sda1 rootfstype=ext3 init=/init rw'] + arg_list += ['consoleblank=0 earlyprintk=vga root=/dev/sda1 init=/init rw'] else: - arg_list += ['console=ttyS0 earlycon=uart8250,io,0x3f8,115200n8 root=/dev/sda1 rootfstype=ext3 init=/init rw'] + arg_list += ['console=ttyS0 earlycon=uart8250,io,0x3f8,115200n8 root=/dev/sda1 init=/init rw'] return arg_list diff --git a/steps-guix/jump/linux64.sh b/steps-guix/jump/linux64.sh index 9dc79984..6807a849 100644 --- a/steps-guix/jump/linux64.sh +++ b/steps-guix/jump/linux64.sh @@ -26,4 +26,7 @@ else kexec -l "${current_kernel}" --console-serial \ --append="console=ttyS0 root=/dev/sda1 init=/init rw rootwait" fi +sync +echo u > /proc/sysrq-trigger || true +mount -o remount,ro / || true kexec -e diff --git a/steps/jump/linux.sh b/steps/jump/linux.sh index 3496d58d..79ea533f 100755 --- a/steps/jump/linux.sh +++ b/steps/jump/linux.sh @@ -23,10 +23,13 @@ else # kexec time if [ "${BARE_METAL}" = True ]; then kexec -l "/boot/vmlinuz" \ - --append="root=/dev/sda1 rootfstype=ext3 init=/init rw rootwait" + --append="root=/dev/sda1 init=/init rw rootwait" else kexec -l "/boot/vmlinuz" --console-serial \ - --append="console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw rootwait" + --append="console=ttyS0 root=/dev/sda1 init=/init rw rootwait" fi + sync + echo u > /proc/sysrq-trigger || true + mount -o remount,ro / || true kexec -e fi