diff options
| author | Daniel Peebles <copumpkin@users.noreply.github.com> | 2017-07-13 00:31:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-13 00:31:44 -0400 |
| commit | 598d79ae7d3d53d4bb4e317cb8f8a035c7151b35 (patch) | |
| tree | 16303994665c36ee44ade65d0960c15827b4f26c /nixos | |
| parent | 5cb11abc9e7a24ea7d8b612f0957e516dea8d288 (diff) | |
| parent | fa5700544b5c921ce24383d516db16c1386be1f1 (diff) | |
| download | nixlib-598d79ae7d3d53d4bb4e317cb8f8a035c7151b35.tar nixlib-598d79ae7d3d53d4bb4e317cb8f8a035c7151b35.tar.gz nixlib-598d79ae7d3d53d4bb4e317cb8f8a035c7151b35.tar.bz2 nixlib-598d79ae7d3d53d4bb4e317cb8f8a035c7151b35.tar.lz nixlib-598d79ae7d3d53d4bb4e317cb8f8a035c7151b35.tar.xz nixlib-598d79ae7d3d53d4bb4e317cb8f8a035c7151b35.tar.zst nixlib-598d79ae7d3d53d4bb4e317cb8f8a035c7151b35.zip | |
Merge pull request #27341 from lheckemann/installer-fixes
nixos-install: quote nixos-prepare-root arguments
Diffstat (limited to 'nixos')
| -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 |