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

* Rename the CD modules to something more sensible.

Browse Source 
* Make sure that reconfiguration in the live CD works properly by
  including the proper configuration module in
  /etc/nixos/configuration.nix.  Ugly.

svn path=/nixos/branches/modular-nixos/; revision=16016
This commit is contained in:
Eelco Dolstra 2009-06-22 10:03:58 +00:00
parent fc3eecad91
commit 97a4e1fcb3
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/installer/cd-dvd/installation-cd-base.nix
View File

@ -13,6 +13,15 @@ let
NixOS version number. NixOS version number.
''; '';
}; };
installer.configModule = pkgs.lib.mkOption {
example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
description = ''
Filename of the configuration module that builds the CD
configuration. Must be specified to support reconfiguration
in live CDs.
'';
};
}; };
@ -46,7 +55,7 @@ let
{config, pkgs, ...}: {config, pkgs, ...}:
{ {
require = [./nixos/modules/installer/cd-dvd/installation-cd.nix]; require = [${config.installer.configModule}];
# Add your own options below and run "nixos-rebuild switch". # Add your own options below and run "nixos-rebuild switch".
# E.g., # E.g.,

2
modules/installer/cd-dvd/installation-cd-big.nix → modules/installer/cd-dvd/installation-cd-graphical.nix
View File

@ -6,6 +6,8 @@
{ {
require = [./installation-cd-base.nix]; require = [./installation-cd-base.nix];
installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-graphical.nix";
services.xserver = { services.xserver = {
enable = true; enable = true;
autorun = false; autorun = false;

2
modules/installer/cd-dvd/installation-cd-small.nix → modules/installer/cd-dvd/installation-cd-minimal.nix
View File

@ -6,6 +6,8 @@
{ {
require = [./installation-cd-base.nix]; require = [./installation-cd-base.nix];
installer.configModule = "./nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
# Don't include X libraries. # Don't include X libraries.
services.sshd.forwardX11 = false; services.sshd.forwardX11 = false;
fonts.enableFontConfig = false; fonts.enableFontConfig = false;