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

nixos-rebuild: Support --option

This commit is contained in:
Eelco Dolstra 2012-09-14 13:23:19 -04:00
parent ad65e807bd
commit 75583c7984
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/installer/tools/nixos-rebuild.sh
View File

@ -36,10 +36,10 @@ Options:
Various nix-build options are also accepted, in particular: Various nix-build options are also accepted, in particular:
--show-trace show a detailed stack trace for evaluation errors --show-trace show a detailed stack trace for evaluation errors
Environment variables affecting nixos-rebuild: Environment variables affecting nixos-rebuild:
\$NIX_PATH Nix expression search path \$NIX_PATH Nix expression search path
\$NIXOS_CONFIG path to the NixOS system configuration specification \$NIXOS_CONFIG path to the NixOS system configuration specification
EOF EOF
exit 1 exit 1
@ -85,6 +85,11 @@ while test "$#" -gt 0; do
j="$1"; shift 1 j="$1"; shift 1
extraBuildFlags="$extraBuildFlags $i $j" extraBuildFlags="$extraBuildFlags $i $j"
;; ;;
--option)
j="$1"; shift 1
k="$1"; shift 1
extraBuildFlags="$extraBuildFlags $i $j $k"
;;
--fast) --fast)
buildNix= buildNix=
extraBuildFlags="$extraBuildFlags --show-trace" extraBuildFlags="$extraBuildFlags --show-trace"
@ -202,7 +207,7 @@ fi
if test "$action" = switch -o "$action" = boot -o "$action" = test; then if test "$action" = switch -o "$action" = boot -o "$action" = test; then
# Just in case the new configuration hangs the system, do a sync now. # Just in case the new configuration hangs the system, do a sync now.
sync sync
$pathToConfig/bin/switch-to-configuration "$action" $pathToConfig/bin/switch-to-configuration "$action"
fi fi