svn path=/nixos/trunk/; revision=11203
This commit is contained in:
parent
79ffaeb2e7
commit
e32a8437d5
@ -236,6 +236,10 @@ rec {
|
|||||||
timeout 10
|
timeout 10
|
||||||
splashimage /boot/background.xpm.gz
|
splashimage /boot/background.xpm.gz
|
||||||
|
|
||||||
|
title Boot from hard disk
|
||||||
|
root (hd0)
|
||||||
|
chainloader +1
|
||||||
|
|
||||||
title NixOS Installer / Rescue
|
title NixOS Installer / Rescue
|
||||||
kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
|
kernel /boot/vmlinuz ${toString system.config.boot.kernelParams}
|
||||||
initrd /boot/initrd
|
initrd /boot/initrd
|
||||||
|
@ -48,5 +48,5 @@ stdenv.mkDerivation {
|
|||||||
map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
|
map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
|
||||||
exportBuildReferencesGraph =
|
exportBuildReferencesGraph =
|
||||||
map (x: [("closure-build-" + baseNameOf x.object) x.object]) buildStoreContents;
|
map (x: [("closure-build-" + baseNameOf x.object) x.object]) buildStoreContents;
|
||||||
pathsFromGraph = ../../nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl;
|
pathsFromGraph = ../pkgs/build-support/kernel/paths-from-graph.pl;
|
||||||
}
|
}
|
||||||
|
@ -19,7 +19,7 @@ in
|
|||||||
inherit nix;
|
inherit nix;
|
||||||
nixpkgsURL = config.installer.nixpkgsURL;
|
nixpkgsURL = config.installer.nixpkgsURL;
|
||||||
|
|
||||||
pathsFromGraph = ../../nixpkgs/pkgs/build-support/kernel/paths-from-graph.pl;
|
pathsFromGraph = ../pkgs/build-support/kernel/paths-from-graph.pl;
|
||||||
|
|
||||||
nixClosure = pkgs.runCommand "closure"
|
nixClosure = pkgs.runCommand "closure"
|
||||||
{exportReferencesGraph = ["refs" nix];}
|
{exportReferencesGraph = ["refs" nix];}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user