public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Don't hardcode selinux=0 etc.

Browse Source 
* Store the paths of init and initrd.

svn path=/nixu/trunk/; revision=7147
This commit is contained in:
Eelco Dolstra 2006-11-27 13:59:50 +00:00
parent 8c0b223c3c
commit 5bc78ac151
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/boot-environment.nix
View File

@ -212,7 +212,6 @@ rec {
pkgs.shadowutils pkgs.shadowutils
pkgs.strace pkgs.strace
pkgs.sysklogd pkgs.sysklogd
# pkgs.sysvinit
# pkgs.vim # pkgs.vim
nix nix
nixosInstaller nixosInstaller

9
test/system-configuration.nix
View File

@ -16,7 +16,14 @@ let
}; };
# Extra kernel command line arguments. # 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 in

5
test/system-configuration.sh
View File

@ -4,9 +4,12 @@ ensureDir $out
ln -s $kernel $out/kernel ln -s $kernel $out/kernel
ln -s $grub $out/grub 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 cat > $out/menu.lst << GRUBEND
kernel $kernel selinux=0 apm=on acpi=on init=$bootStage2 $extraKernelParams kernel $kernel init=$bootStage2 $extraKernelParams
initrd $initrd initrd $initrd
GRUBEND GRUBEND