diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-07 13:52:42 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-07 13:52:42 +0100 |
| commit | a115bff08c1f2046957d09a6a908202d1b98c311 (patch) | |
| tree | e15cfb7f524284fcefa5119e7ee0abe2ae1096d9 /nixos/modules/installer/tools | |
| parent | 234f4611393a6818b317f3ad93d2e276515bdc33 (diff) | |
| parent | 98ffc61e2f846c4818280a4cccce3fdad3eb9677 (diff) | |
| download | nixpkgs-a115bff08c1f2046957d09a6a908202d1b98c311.tar nixpkgs-a115bff08c1f2046957d09a6a908202d1b98c311.tar.gz nixpkgs-a115bff08c1f2046957d09a6a908202d1b98c311.tar.bz2 nixpkgs-a115bff08c1f2046957d09a6a908202d1b98c311.tar.lz nixpkgs-a115bff08c1f2046957d09a6a908202d1b98c311.tar.xz nixpkgs-a115bff08c1f2046957d09a6a908202d1b98c311.tar.zst nixpkgs-a115bff08c1f2046957d09a6a908202d1b98c311.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nixos/modules/installer/tools')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 4 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/nixos-rebuild.sh | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 2284eba07a2..ec880e08472 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -349,7 +349,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) { fileSystems.\"$mountPoint\" = { device = \"$base$path\"; fsType = \"none\"; - options = \"bind\"; + options = \[ \"bind\" \]; }; EOF @@ -409,7 +409,7 @@ EOF if (scalar @extraOptions > 0) { $fileSystems .= <<EOF; - options = \"${\join ",", uniq(@extraOptions)}\"; + options = \[ ${\join " ", map { "\"" . $_ . "\"" } uniq(@extraOptions)} \]; EOF } diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 105d1cd1625..e0e79f63fab 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -149,10 +149,11 @@ nixBuild() { local j="$1"; shift 1 instArgs+=("$i" "$j") ;; - -I) - # We don't want this in buildArgs + -I) # We don't want this in buildArgs shift 1 ;; + --no-out-link) # We don't want this in buildArgs + ;; "<"*) # nix paths instArgs+=("$i") ;; @@ -329,7 +330,7 @@ fi if [ -z "$rollback" ]; then echo "building the system configuration..." >&2 if [ "$action" = switch -o "$action" = boot ]; then - pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system "${extraBuildFlags[@]}")" + pathToConfig="$(nixBuild '<nixpkgs/nixos>' --no-out-link -A system "${extraBuildFlags[@]}")" copyToTarget "$pathToConfig" targetHostCmd nix-env -p "$profile" --set "$pathToConfig" elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then |