* Merge the test and upgrade scripts into a program "nixos-rebuild"
which is included in the system path. svn path=/nixos/trunk/; revision=7853
This commit is contained in:
parent
25684805d5
commit
08ad51690d
@ -1,4 +1,4 @@
|
||||
{ stdenv, perl, runCommand, substituteAll, nix
|
||||
{ perl, runCommand, substituteAll, nix
|
||||
, # URL of the Nixpkgs distribution that the installer will pull.
|
||||
# Leave empty for a pure source distribution.
|
||||
nixpkgsURL ? ""
|
||||
|
9
installer/nixos-rebuild.nix
Normal file
9
installer/nixos-rebuild.nix
Normal file
@ -0,0 +1,9 @@
|
||||
{substituteAll, nix}:
|
||||
|
||||
substituteAll {
|
||||
name = "nixos-rebuild";
|
||||
src = ./nixos-rebuild.sh;
|
||||
dir = "bin";
|
||||
isExecutable = true;
|
||||
inherit nix;
|
||||
}
|
49
installer/nixos-rebuild.sh
Normal file
49
installer/nixos-rebuild.sh
Normal file
@ -0,0 +1,49 @@
|
||||
#! @shell@ -e
|
||||
|
||||
|
||||
# What are we supposed to do?
|
||||
action="$1"
|
||||
|
||||
if test -z "$action"; then
|
||||
# !!! more or less cut&paste from
|
||||
# system/switch-to-configuration.sh (which we call, of course).
|
||||
cat <<EOF
|
||||
Usage: $0 [switch|boot|test|build]
|
||||
|
||||
switch: make the configuration the boot default and activate now
|
||||
boot: make the configuration the boot default
|
||||
test: activate the configuration, but don't make it the boot default
|
||||
build: build the configuration, but don't make it the default or
|
||||
activate it
|
||||
EOF
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
# Allow the location of NixOS sources and the system configuration
|
||||
# file to be overridden.
|
||||
if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
|
||||
if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
|
||||
|
||||
|
||||
# Either upgrade the configuration in the system profile (for "switch"
|
||||
# or "boot"), or just build it and create a symlink "result" in the
|
||||
# current directory (for "build" and "test").
|
||||
if test "$action" = "switch" -o "$action" = "boot"; then
|
||||
nix-env -p /nix/var/nix/profiles/system -f $NIXOS/system/system.nix \
|
||||
--arg configuration "import $NIXOS_CONFIG" \
|
||||
--set -A system
|
||||
pathToConfig=/nix/var/nix/profiles/system
|
||||
else
|
||||
nix-build $NIXOS/system/system.nix \
|
||||
--arg configuration "import $NIXOS_CONFIG" \
|
||||
-A system -K -k
|
||||
pathToConfig=./result
|
||||
fi
|
||||
|
||||
|
||||
# If we're not just building, then make the new configuration the boot
|
||||
# default and/or activate it now.
|
||||
if test "$action" = "switch" -o "$action" = "boot" -o "$action" = "test"; then
|
||||
$pathToConfig/bin/switch-to-configuration "$action"
|
||||
fi
|
@ -111,11 +111,16 @@ rec {
|
||||
|
||||
# The installer.
|
||||
nixosInstall = import ../installer/nixos-install.nix {
|
||||
inherit (pkgs) stdenv perl runCommand substituteAll;
|
||||
inherit (pkgs) perl runCommand substituteAll;
|
||||
inherit nix;
|
||||
nixpkgsURL = config.get ["installer" "nixpkgsURL"];
|
||||
};
|
||||
|
||||
nixosRebuild = import ../installer/nixos-rebuild.nix {
|
||||
inherit (pkgs) substituteAll;
|
||||
inherit nix;
|
||||
};
|
||||
|
||||
|
||||
# NSS modules. Hacky!
|
||||
nssModules =
|
||||
@ -186,6 +191,7 @@ rec {
|
||||
# pkgs.vim
|
||||
nix
|
||||
nixosInstall
|
||||
nixosRebuild
|
||||
setuidWrapper
|
||||
];
|
||||
|
||||
|
9
test.sh
9
test.sh
@ -1,9 +0,0 @@
|
||||
#! /bin/sh -e
|
||||
|
||||
if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
|
||||
if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
|
||||
|
||||
nix-build $NIXOS/system/system.nix \
|
||||
--arg configuration "import $NIXOS_CONFIG" \
|
||||
-A system -K -k
|
||||
./result/bin/switch-to-configuration test
|
@ -1,9 +0,0 @@
|
||||
#! /bin/sh -e
|
||||
|
||||
if test -z "$NIXOS"; then NIXOS=/etc/nixos/nixos; fi
|
||||
if test -z "$NIXOS_CONFIG"; then NIXOS_CONFIG=/etc/nixos/configuration.nix; fi
|
||||
|
||||
nix-env -p /nix/var/nix/profiles/system -f $NIXOS/system/system.nix \
|
||||
--arg configuration "import $NIXOS_CONFIG" \
|
||||
--set -A system
|
||||
/nix/var/nix/profiles/system/bin/switch-to-configuration switch
|
Loading…
Reference in New Issue
Block a user