movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-18 07:29:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

* Break the cyclic dependency between the system derivation and

Browse source 
Grub's menu.lst.

svn path=/nixos/branches/modular-nixos/; revision=15931
This commit is contained in:
Eelco Dolstra 2009-06-10 21:46:42 +00:00
parent 1cea6b09ef
commit cd1e4aefc1
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/make-iso9660-image.sh
View file

@ -41,7 +41,7 @@ touch pathlist
# Add the individual files. # Add the individual files.
for ((i = 0; i < ${#targets_[@]}; i++)); do for ((i = 0; i < ${#targets_[@]}; i++)); do
stripSlash "${targets_[$i]}" stripSlash "${targets_[$i]}"
echo "$res=$(readlink -f ${sources_[$i]})" >> pathlist echo "$res=${sources_[$i]}" >> pathlist
done done

10
modules/installer/cd-dvd/iso-image.nix
View file

@ -132,6 +132,14 @@ in
source = pkgs.runCommand "empty" {} "ensureDir $out"; source = pkgs.runCommand "empty" {} "ensureDir $out";
target = "/nix/store"; target = "/nix/store";
} }
{ # Another quick hack: the kernel needs a systemConfig
# parameter in menu.lst, but the system config depends on
# menu.lst. Break the cyclic dependency by having a /system
# symlink on the CD, and having menu.lst refer to /system.
source = pkgs.runCommand "system" {}
"ln -s ${config.system.build.system} $out";
target = "/system";
}
]; ];
# The Grub menu. # The Grub menu.
@ -142,7 +150,7 @@ in
chainloader +1 chainloader +1
title NixOS Installer / Rescue title NixOS Installer / Rescue
kernel /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=${config.system.build.system} ${toString config.boot.kernelParams} kernel /boot/vmlinuz init=${config.system.build.bootStage2} systemConfig=/system ${toString config.boot.kernelParams}
initrd /boot/initrd initrd /boot/initrd
''; '';