diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-08 23:22:21 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-05-09 00:52:02 +0200 |
| commit | 22f102cbdc7e88ecb41b5d0a8720c8117e161aca (patch) | |
| tree | f4358df440bffd460c6ff704a8ec3a1184825ce9 /nixos/modules/installer/tools/nixos-install.sh | |
| parent | 171d43ba4f51384670c8af0e5188c023f5bb0d94 (diff) | |
| download | nixpkgs-22f102cbdc7e88ecb41b5d0a8720c8117e161aca.tar nixpkgs-22f102cbdc7e88ecb41b5d0a8720c8117e161aca.tar.gz nixpkgs-22f102cbdc7e88ecb41b5d0a8720c8117e161aca.tar.bz2 nixpkgs-22f102cbdc7e88ecb41b5d0a8720c8117e161aca.tar.lz nixpkgs-22f102cbdc7e88ecb41b5d0a8720c8117e161aca.tar.xz nixpkgs-22f102cbdc7e88ecb41b5d0a8720c8117e161aca.tar.zst nixpkgs-22f102cbdc7e88ecb41b5d0a8720c8117e161aca.zip | |
nixos-install: Assume the build user group is "nixbld"
The build user group is always "nixbld", so no need to detect it.
Diffstat (limited to 'nixos/modules/installer/tools/nixos-install.sh')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-install.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 7f3cfa2ca7d..3fd8bdbd69e 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -97,12 +97,7 @@ mkdir -m 0755 -p \ $mountPoint/nix/var/log/nix/drvs mkdir -m 1775 -p $mountPoint/nix/store -build_users_group=$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"build-users-group"};') -if test -n "$build_users_group"; then - chown root:"$build_users_group" $mountPoint/nix/store -else - chown root $mountPoint/nix/store -fi +chown root:nixbld $mountPoint/nix/store # Get the store paths to copy from the references graph. @@ -130,9 +125,7 @@ unset NIX_REMOTE # Create a temporary Nix config file that causes the nixbld users to # be used. -if test -n "$build_users_group"; then - echo "build-users-group = $build_users_group" > $mountPoint/tmp/nix.conf -fi +echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf # FIXME: remove in Nix 1.8 binary_caches=$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};') if test -n "$binary_caches"; then echo "binary-caches = $binary_caches" >> $mountPoint/tmp/nix.conf |