Move the generation of the dummy configuration file into the installation
device profile. TODO: The current configuration does not reproduce exactly the CD configuration, fix it. svn path=/nixos/trunk/; revision=23913
This commit is contained in:
Nicolas Pierron
parent
112cd0c4d4
commit
d2d139e920
@ -9,13 +9,8 @@ let
|
|||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
system.nixosVersion = mkOption {
|
# you can retrieve the profiles which have been used by looking at the
|
||||||
default = "${builtins.readFile ../../../VERSION}";
|
# list of modules use to configure the installation device.
|
||||||
description = ''
|
|
||||||
NixOS version number.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
installer.configModule = mkOption {
|
installer.configModule = mkOption {
|
||||||
example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
|
example = "./nixos/modules/installer/cd-dvd/installation-cd.nix";
|
||||||
description = ''
|
description = ''
|
||||||
@ -45,27 +40,6 @@ let
|
|||||||
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
|
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" (cleanSource pkgs.path);
|
||||||
|
|
||||||
includeSources = true;
|
includeSources = true;
|
||||||
|
|
||||||
|
|
||||||
# A dummy /etc/nixos/configuration.nix in the booted CD that
|
|
||||||
# rebuilds the CD's configuration (and allows the configuration to
|
|
||||||
# be modified, of course, providing a true live CD). Problem is
|
|
||||||
# that we don't really know how the CD was built - the Nix
|
|
||||||
# expression language doesn't allow us to query the expression being
|
|
||||||
# evaluated. So we'll just hope for the best.
|
|
||||||
dummyConfiguration = pkgs.writeText "configuration.nix"
|
|
||||||
''
|
|
||||||
{config, pkgs, ...}:
|
|
||||||
|
|
||||||
{
|
|
||||||
require = [${config.installer.configModule}];
|
|
||||||
|
|
||||||
# Add your own options below and run "nixos-rebuild switch".
|
|
||||||
# E.g.,
|
|
||||||
# services.openssh.enable = true;
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
|
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
@ -104,11 +78,6 @@ in
|
|||||||
tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
|
tar xjf ${nixpkgsTarball}/nixpkgs.tar.bz2 -C /etc/nixos/nixpkgs
|
||||||
chown -R root.root /etc/nixos
|
chown -R root.root /etc/nixos
|
||||||
''}
|
''}
|
||||||
|
|
||||||
# Provide a configuration for the CD/DVD itself, to allow users
|
|
||||||
# to run nixos-rebuild to change the configuration of the
|
|
||||||
# running system on the CD/DVD.
|
|
||||||
cp ${dummyConfiguration} /etc/nixos/configuration.nix
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# To speed up installation a little bit, include the complete stdenv
|
# To speed up installation a little bit, include the complete stdenv
|
||||||
|
|||||||
@ -1,48 +1,121 @@
|
|||||||
{config, pkgs, ...}:
|
{config, pkgs, ...}:
|
||||||
|
|
||||||
{
|
with pkgs.lib;
|
||||||
# Show the manual.
|
|
||||||
services.nixosManual.showManual = true;
|
|
||||||
|
|
||||||
# Let the user play Rogue on TTY 8 during the installation.
|
let
|
||||||
services.rogue.enable = true;
|
# Location of the repository on the harddrive
|
||||||
|
profilePath = toString ./.;
|
||||||
|
|
||||||
# Disable some other stuff we don't need.
|
# Check if the path is from the NixOS repository
|
||||||
security.sudo.enable = false;
|
isProfile = path:
|
||||||
|
let s = toString path; in
|
||||||
|
removePrefix profilePath s != s;
|
||||||
|
|
||||||
# Include only the en_US locale. This saves 75 MiB or so compared to
|
# Rename NixOS modules used to setup the current device to make findable form
|
||||||
# the full glibcLocales package.
|
# the default location of the configuration.nix file.
|
||||||
i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
|
getProfileModules =
|
||||||
|
map (path: "./nixos/modules/profiles" + removePrefix isProfile (toString path))
|
||||||
|
filter (m: isPath m && isProfile m) modules;
|
||||||
|
|
||||||
# nixos-install will do a pull from this channel to speed up the
|
# A dummy /etc/nixos/configuration.nix in the booted CD that
|
||||||
# installation.
|
# rebuilds the CD's configuration (and allows the configuration to
|
||||||
installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
|
# be modified, of course, providing a true live CD). Problem is
|
||||||
|
# that we don't really know how the CD was built - the Nix
|
||||||
boot.postBootCommands =
|
# expression language doesn't allow us to query the expression being
|
||||||
|
# evaluated. So we'll just hope for the best.
|
||||||
|
configClone = pkgs.writeText "configuration.nix"
|
||||||
''
|
''
|
||||||
# Provide a mount point for nixos-install.
|
{config, pkgs, ...}:
|
||||||
mkdir -p /mnt
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Some more help text.
|
{
|
||||||
services.mingetty.helpLine =
|
require = [${toString config.installer.cloneConfigIncludes}];
|
||||||
''
|
|
||||||
|
# Add your own options below and run "nixos-rebuild switch".
|
||||||
Log in as "root" with an empty password. ${
|
# E.g.,
|
||||||
if config.services.xserver.enable then
|
# services.openssh.enable = true;
|
||||||
"Type `start xserver' to start\nthe graphical user interface."
|
|
||||||
else ""
|
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
|
in
|
||||||
|
|
||||||
|
{
|
||||||
|
options = {
|
||||||
|
system.nixosVersion = mkOption {
|
||||||
|
default = "${builtins.readFile ../../VERSION}";
|
||||||
|
description = ''
|
||||||
|
NixOS version number.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
installer.cloneConfig = mkOption {
|
||||||
|
default = true;
|
||||||
|
description = ''
|
||||||
|
Try to clone the installation-device configuration by re-using it's
|
||||||
|
profile from the list of imported modules.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
installer.cloneConfigIncludes = mkOption {
|
||||||
|
default = [];
|
||||||
|
example = [ "./nixos/modules/hardware/network/rt73.nix" ];
|
||||||
|
description = ''
|
||||||
|
List of modules used to re-build this installation device profile.
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = {
|
||||||
|
installer.cloneConfigIncludes = getProfileModules;
|
||||||
|
|
||||||
|
# Show the manual.
|
||||||
|
services.nixosManual.showManual = true;
|
||||||
|
|
||||||
|
# Let the user play Rogue on TTY 8 during the installation.
|
||||||
|
services.rogue.enable = true;
|
||||||
|
|
||||||
|
# Disable some other stuff we don't need.
|
||||||
|
security.sudo.enable = false;
|
||||||
|
|
||||||
|
# Include only the en_US locale. This saves 75 MiB or so compared to
|
||||||
|
# the full glibcLocales package.
|
||||||
|
i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
|
||||||
|
|
||||||
|
# nixos-install will do a pull from this channel to speed up the
|
||||||
|
# installation.
|
||||||
|
installer.nixpkgsURL = http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable;
|
||||||
|
|
||||||
|
boot.postBootCommands =
|
||||||
|
''
|
||||||
|
# Provide a mount point for nixos-install.
|
||||||
|
mkdir -p /mnt
|
||||||
|
|
||||||
|
${optionalString config.installer.cloneConfig ''
|
||||||
|
# Provide a configuration for the CD/DVD itself, to allow users
|
||||||
|
# to run nixos-rebuild to change the configuration of the
|
||||||
|
# running system on the CD/DVD.
|
||||||
|
cp ${configClone} /etc/nixos/configuration.nix
|
||||||
|
''}
|
||||||
|
'';
|
||||||
|
|
||||||
|
# Some more help text.
|
||||||
|
services.mingetty.helpLine =
|
||||||
|
''
|
||||||
|
|
||||||
|
Log in as "root" with an empty password. ${
|
||||||
|
if config.services.xserver.enable then
|
||||||
|
"Type `start xserver' to start\nthe graphical user interface."
|
||||||
|
else ""
|
||||||
|
}
|
||||||
|
'';
|
||||||
|
|
||||||
|
|
||||||
# Allow sshd to be started manually through "start sshd". It should
|
# Allow sshd to be started manually through "start sshd". It should
|
||||||
# not be started by default on the installation CD because the
|
# not be started by default on the installation CD because the
|
||||||
# default root password is empty.
|
# default root password is empty.
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
|
jobs.sshd.startOn = pkgs.lib.mkOverride 50 "";
|
||||||
|
|
||||||
# Enable wpa_supplicant, but don't start it by default.
|
# Enable wpa_supplicant, but don't start it by default.
|
||||||
networking.enableWLAN = true;
|
networking.enableWLAN = true;
|
||||||
jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
|
jobs.wpa_supplicant.startOn = pkgs.lib.mkOverride 50 "";
|
||||||
}
|
};
|
||||||
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user