diff options
| author | Linus Heckemann <git@sphalerite.org> | 2017-07-12 21:56:12 +0100 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2017-07-12 21:58:25 +0100 |
| commit | fa5700544b5c921ce24383d516db16c1386be1f1 (patch) | |
| tree | 5f778ca544ee0843938862b4db266732a2ef35fe /nixos/modules/installer/tools | |
| parent | 3d380b90823aee1e48c6e9e286b76f476253eae8 (diff) | |
| download | nixlib-fa5700544b5c921ce24383d516db16c1386be1f1.tar nixlib-fa5700544b5c921ce24383d516db16c1386be1f1.tar.gz nixlib-fa5700544b5c921ce24383d516db16c1386be1f1.tar.bz2 nixlib-fa5700544b5c921ce24383d516db16c1386be1f1.tar.lz nixlib-fa5700544b5c921ce24383d516db16c1386be1f1.tar.xz nixlib-fa5700544b5c921ce24383d516db16c1386be1f1.tar.zst nixlib-fa5700544b5c921ce24383d516db16c1386be1f1.zip | |
nixos-install: quote nixos-prepare-root arguments
This prevents the script from breaking when channel_root is empty.
Diffstat (limited to 'nixos/modules/installer/tools')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index e2ae2ee9fdf8..087fbcd4512f 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -140,7 +140,7 @@ channel_closure="$tmpdir/channel.closure" nix-store --export $channel_root > $channel_closure # Populate the target root directory with the basics -@prepare_root@/bin/nixos-prepare-root $mountPoint $channel_root $system_root @nixClosure@ $system_closure $channel_closure +@prepare_root@/bin/nixos-prepare-root "$mountPoint" "$channel_root" "$system_root" @nixClosure@ "$system_closure" "$channel_closure" # nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store |