diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2017-02-14 16:35:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-14 16:35:43 +0100 |
| commit | 14c47bd546231ec3b454a994cc1db8e770e807b5 (patch) | |
| tree | d27d102709596b7b8bf06cf6182e07f49e835ffb /nixos/modules/installer | |
| parent | 314dd9215b3d377ad52fc54124045945211f72c9 (diff) | |
| parent | 2000f0941e5de5ce62ede09f2003ff3ccfcd26ac (diff) | |
| download | nixpkgs-14c47bd546231ec3b454a994cc1db8e770e807b5.tar nixpkgs-14c47bd546231ec3b454a994cc1db8e770e807b5.tar.gz nixpkgs-14c47bd546231ec3b454a994cc1db8e770e807b5.tar.bz2 nixpkgs-14c47bd546231ec3b454a994cc1db8e770e807b5.tar.lz nixpkgs-14c47bd546231ec3b454a994cc1db8e770e807b5.tar.xz nixpkgs-14c47bd546231ec3b454a994cc1db8e770e807b5.tar.zst nixpkgs-14c47bd546231ec3b454a994cc1db8e770e807b5.zip | |
Merge pull request #22758 from dezgeg/pr-nixos-rebuild
nixos-rebuild: Don't rebuild nixos-rebuild when --fast is used
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 8e55a4f525f..4f73865dad6 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -15,6 +15,7 @@ origArgs=("$@") extraBuildFlags=() action= buildNix=1 +fast= rollback= upgrade= repair= @@ -52,13 +53,13 @@ while [ "$#" -gt 0 ]; do repair=1 extraBuildFlags+=("$i") ;; - --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q) - extraBuildFlags+=("$i") - ;; --max-jobs|-j|--cores|-I) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; + --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*) + extraBuildFlags+=("$i") + ;; --option) j="$1"; shift 1 k="$1"; shift 1 @@ -66,6 +67,7 @@ while [ "$#" -gt 0 ]; do ;; --fast) buildNix= + fast=1 extraBuildFlags+=(--show-trace) ;; --profile-name|-p) @@ -217,7 +219,7 @@ if [ -z "$_NIXOS_REBUILD_REEXEC" ]; then fi # Re-execute nixos-rebuild from the Nixpkgs tree. -if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" ]; then +if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" -a -z "$fast" ]; then if p=$(nix-build --no-out-link --expr 'with import <nixpkgs/nixos> {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then export _NIXOS_REBUILD_REEXEC=1 exec $p/bin/nixos-rebuild "${origArgs[@]}" |