public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos-install: Respect the build-users-group of the host

Browse Source
This commit is contained in:
Shea Levy 2013-02-04 07:46:09 -05:00
parent 722d8497e7
commit e83f946f9e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/installer/tools/nixos-install.sh
View File

@ -85,7 +85,12 @@ mkdir -m 0755 -p \
$mountPoint/nix/var/log/nix/drvs $mountPoint/nix/var/log/nix/drvs
mkdir -m 1775 -p $mountPoint/nix/store mkdir -m 1775 -p $mountPoint/nix/store
chown root:nixbld $mountPoint/nix/store build_users_group=$((grep build-users-group "$NIX_CONF_DIR/nix.conf" 2>/dev/null | awk '{ print $3 }') || echo -n "")
if test -n "$build_users_group"; then
chown root:"$build_users_group" $mountPoint/nix/store
else
chown root $mountPoint/nix/store
fi
# Get the store paths to copy from the references graph. # Get the store paths to copy from the references graph.
@ -109,7 +114,9 @@ export LC_TIME=
# Create a temporary Nix config file that causes the nixbld users to # Create a temporary Nix config file that causes the nixbld users to
# be used. # be used.
echo "build-users-group = nixbld" > $mountPoint/tmp/nix.conf if test -n "$build_users_group"; then
echo "build-users-group = $build_users_group" > $mountPoint/tmp/nix.conf
fi
grep binary-caches "$NIX_CONF_DIR/nix.conf" >> $mountPoint/tmp/nix.conf || true grep binary-caches "$NIX_CONF_DIR/nix.conf" >> $mountPoint/tmp/nix.conf || true
export NIX_CONF_DIR=/tmp export NIX_CONF_DIR=/tmp