diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-07 12:12:39 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-07 12:12:39 +0000 |
| commit | 5cff6eda3d29e220157cb1793b1f9279c5ee539c (patch) | |
| tree | d31b428e975c716b9bdc05c7ab9be9d9743e06c1 /modules/installer/tools/nixos-rebuild.sh | |
| parent | 908a025b2229d8d0793a2e6787773ca76e9519a8 (diff) | |
| download | nixpkgs-5cff6eda3d29e220157cb1793b1f9279c5ee539c.tar nixpkgs-5cff6eda3d29e220157cb1793b1f9279c5ee539c.tar.gz nixpkgs-5cff6eda3d29e220157cb1793b1f9279c5ee539c.tar.bz2 nixpkgs-5cff6eda3d29e220157cb1793b1f9279c5ee539c.tar.lz nixpkgs-5cff6eda3d29e220157cb1793b1f9279c5ee539c.tar.xz nixpkgs-5cff6eda3d29e220157cb1793b1f9279c5ee539c.tar.zst nixpkgs-5cff6eda3d29e220157cb1793b1f9279c5ee539c.zip | |
* Revert r21410 because it breaks handling of "--max-jobs".
svn path=/nixos/trunk/; revision=26187
Diffstat (limited to 'modules/installer/tools/nixos-rebuild.sh')
| -rw-r--r-- | modules/installer/tools/nixos-rebuild.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh index 41b74494337..6789d48ace3 100644 --- a/modules/installer/tools/nixos-rebuild.sh +++ b/modules/installer/tools/nixos-rebuild.sh @@ -84,15 +84,9 @@ while test "$#" -gt 0; do --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|--fallback) extraBuildFlags="$extraBuildFlags $i" ;; - --max-jobs|-j*) - if [ -z "${i:2}" ]; then - # -j n - extraBuildFlags="$extraBuildFlags $i $1" - shift 1 - else - # -jn - extraBuildFlags="$extraBuildFlags $i" - fi + --max-jobs|-j) + j="$1"; shift 1 + extraBuildFlags="$extraBuildFlags $i $j" ;; --fast) buildNix= |