* Substitute the path of the system derivation directly in the stage 2
init script. This removes the need for the `systemConfig' boot parameter; `init=<stage-2-init>' is enough. However, the GRUB menu builder still needs to add `systemConfig' to the kernel command line for compatibility with old configurations. svn path=/nixos/trunk/; revision=23775
This commit is contained in:
@@ -167,7 +167,7 @@ let
|
||||
-drive file=$NIX_DISK_IMAGE,if=virtio,boot=on,cache=writeback,werror=report \
|
||||
-kernel ${config.system.build.toplevel}/kernel \
|
||||
-initrd ${config.system.build.toplevel}/initrd \
|
||||
-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.bootStage2} systemConfig=${config.system.build.toplevel} regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
|
||||
-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
|
||||
''} \
|
||||
${qemuGraphics} \
|
||||
$QEMU_OPTS \
|
||||
|
||||
Reference in New Issue
Block a user