* Don't hardcode selinux=0 etc.
* Store the paths of init and initrd. svn path=/nixu/trunk/; revision=7147
This commit is contained in:
parent
8c0b223c3c
commit
5bc78ac151
|
@ -212,7 +212,6 @@ rec {
|
|||
pkgs.shadowutils
|
||||
pkgs.strace
|
||||
pkgs.sysklogd
|
||||
# pkgs.sysvinit
|
||||
# pkgs.vim
|
||||
nix
|
||||
nixosInstaller
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue