MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

svn path=/nixos/branches/modular-nixos/; revision=15728

Browse source
This commit is contained in:
Eelco Dolstra 2009-05-25 17:52:43 +00:00
parent 60b3f95ad8
commit d4a87dd5e2
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
system/options.nix
View file

@ -385,6 +385,7 @@ in
../etc/default.nix
../modules/config/fonts.nix
../modules/config/i18n.nix
../modules/config/system-path.nix
../modules/config/unix-odbc-drivers.nix
../modules/config/users-groups.nix
../modules/installer/grub/grub.nix
@ -449,7 +450,6 @@ in
../modules/system/upstart-events/ctrl-alt-delete.nix
../modules/system/upstart-events/halt.nix
../modules/system/upstart-events/maintenance-shell.nix
../modules/config/system-path.nix
../system/assertion.nix
../system/nixos-environment.nix
../system/nixos-installer.nix

5
system/system.nix
View file

@ -43,7 +43,6 @@ rec {
{ inherit platform;
configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
config.nesting.children;
configurationName = config.boot.configurationName;
# Putting it all together. This builds a store object containing
@ -55,7 +54,7 @@ rec {
name = "system";
builder = ./system.sh;
switchToConfiguration = ./switch-to-configuration.sh;
inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils upstart;
inherit (pkgs) grub upstart;
grubDevice = config.boot.grubDevice;
kernelParams =
config.boot.kernelParams ++ config.boot.extraKernelParams;
@ -65,7 +64,7 @@ rec {
etc = config.system.build.etc;
systemPath = config.system.path;
inherit children;
inherit configurationName;
configurationName = config.boot.configurationName;
kernel = config.boot.kernelPackages.kernel + "/vmlinuz";
initrd = initialRamdisk + "/initrd";
# Most of these are needed by grub-install.