svn path=/nixos/branches/modular-nixos/; revision=15728
This commit is contained in:
parent
60b3f95ad8
commit
d4a87dd5e2
|
@ -385,6 +385,7 @@ in
|
||||||
../etc/default.nix
|
../etc/default.nix
|
||||||
../modules/config/fonts.nix
|
../modules/config/fonts.nix
|
||||||
../modules/config/i18n.nix
|
../modules/config/i18n.nix
|
||||||
|
../modules/config/system-path.nix
|
||||||
../modules/config/unix-odbc-drivers.nix
|
../modules/config/unix-odbc-drivers.nix
|
||||||
../modules/config/users-groups.nix
|
../modules/config/users-groups.nix
|
||||||
../modules/installer/grub/grub.nix
|
../modules/installer/grub/grub.nix
|
||||||
|
@ -449,7 +450,6 @@ in
|
||||||
../modules/system/upstart-events/ctrl-alt-delete.nix
|
../modules/system/upstart-events/ctrl-alt-delete.nix
|
||||||
../modules/system/upstart-events/halt.nix
|
../modules/system/upstart-events/halt.nix
|
||||||
../modules/system/upstart-events/maintenance-shell.nix
|
../modules/system/upstart-events/maintenance-shell.nix
|
||||||
../modules/config/system-path.nix
|
|
||||||
../system/assertion.nix
|
../system/assertion.nix
|
||||||
../system/nixos-environment.nix
|
../system/nixos-environment.nix
|
||||||
../system/nixos-installer.nix
|
../system/nixos-installer.nix
|
||||||
|
|
|
@ -43,7 +43,6 @@ rec {
|
||||||
{ inherit platform;
|
{ inherit platform;
|
||||||
configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
|
configuration = x//{boot=((x.boot)//{grubDevice = "";});};}).system)
|
||||||
config.nesting.children;
|
config.nesting.children;
|
||||||
configurationName = config.boot.configurationName;
|
|
||||||
|
|
||||||
|
|
||||||
# Putting it all together. This builds a store object containing
|
# Putting it all together. This builds a store object containing
|
||||||
|
@ -55,7 +54,7 @@ rec {
|
||||||
name = "system";
|
name = "system";
|
||||||
builder = ./system.sh;
|
builder = ./system.sh;
|
||||||
switchToConfiguration = ./switch-to-configuration.sh;
|
switchToConfiguration = ./switch-to-configuration.sh;
|
||||||
inherit (pkgs) grub coreutils gnused gnugrep diffutils findutils upstart;
|
inherit (pkgs) grub upstart;
|
||||||
grubDevice = config.boot.grubDevice;
|
grubDevice = config.boot.grubDevice;
|
||||||
kernelParams =
|
kernelParams =
|
||||||
config.boot.kernelParams ++ config.boot.extraKernelParams;
|
config.boot.kernelParams ++ config.boot.extraKernelParams;
|
||||||
|
@ -65,7 +64,7 @@ rec {
|
||||||
etc = config.system.build.etc;
|
etc = config.system.build.etc;
|
||||||
systemPath = config.system.path;
|
systemPath = config.system.path;
|
||||||
inherit children;
|
inherit children;
|
||||||
inherit configurationName;
|
configurationName = config.boot.configurationName;
|
||||||
kernel = config.boot.kernelPackages.kernel + "/vmlinuz";
|
kernel = config.boot.kernelPackages.kernel + "/vmlinuz";
|
||||||
initrd = initialRamdisk + "/initrd";
|
initrd = initialRamdisk + "/initrd";
|
||||||
# Most of these are needed by grub-install.
|
# Most of these are needed by grub-install.
|
||||||
|
|
Loading…
Reference in a new issue