diff --git a/test/boot-environment.nix b/test/boot-environment.nix index 61638c2980c..a9d85eb773c 100644 --- a/test/boot-environment.nix +++ b/test/boot-environment.nix @@ -212,7 +212,6 @@ rec { pkgs.shadowutils pkgs.strace pkgs.sysklogd -# pkgs.sysvinit # pkgs.vim nix nixosInstaller diff --git a/test/system-configuration.nix b/test/system-configuration.nix index dee0461c2e4..640f17f907e 100644 --- a/test/system-configuration.nix +++ b/test/system-configuration.nix @@ -16,7 +16,14 @@ let }; # Extra kernel command line arguments. - extraKernelParams = "vga=0x317 console=tty1 splash=verbose"; + extraKernelParams = [ + "selinux=0" + "apm=on" + "acpi=on" + "vga=0x317" + "console=tty1" + "splash=verbose" + ]; in diff --git a/test/system-configuration.sh b/test/system-configuration.sh index a9351f97ade..fa2e7def257 100644 --- a/test/system-configuration.sh +++ b/test/system-configuration.sh @@ -4,9 +4,12 @@ ensureDir $out ln -s $kernel $out/kernel ln -s $grub $out/grub +ln -s $bootStage2 $out/init +ln -s $initrd $out/initrd +echo "$extraKernelParams" > $out/kernel-params cat > $out/menu.lst << GRUBEND -kernel $kernel selinux=0 apm=on acpi=on init=$bootStage2 $extraKernelParams +kernel $kernel init=$bootStage2 $extraKernelParams initrd $initrd GRUBEND