diff options
| author | lethalman <lucabru@src.gnome.org> | 2015-03-30 18:06:53 +0200 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2015-03-30 18:06:53 +0200 |
| commit | f72b0c43f661171a48db982a864097fafe3bdac7 (patch) | |
| tree | c935bc41aa395034973c4264e01dcfab5a9c3a39 /nixos/modules/installer | |
| parent | fed2cf85ec5ac1b7806d7caecc9df549bc717baa (diff) | |
| parent | fe6b0b15e6f4a346a204f72310e0914ba7edc941 (diff) | |
| download | nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.gz nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.bz2 nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.lz nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.xz nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.tar.zst nixlib-f72b0c43f661171a48db982a864097fafe3bdac7.zip | |
Merge pull request #6762 from lethalman/nixos-install
nixos-install: support -j, --cores and --option. Closes #6755
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 8f3de10c6133..1ccd6547df5e 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -28,9 +28,14 @@ chrootCommand=(/run/current-system/sw/bin/bash) while [ "$#" -gt 0 ]; do i="$1"; shift 1 case "$i" in - -I) - given_path="$1"; shift 1 - extraBuildFlags+=("$i" "$given_path") + --max-jobs|-j|--cores|-I) + j="$1"; shift 1 + extraBuildFlags+=("$i" "$j") + ;; + --option) + j="$1"; shift 1 + k="$1"; shift 1 + extraBuildFlags+=("$i" "$j" "$k") ;; --root) mountPoint="$1"; shift 1 |