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

Move setting ownership of /nix/store to stage-2-init

Browse Source 
This is necessary because the store might be bind-mounted read-only.
This commit is contained in:
Eelco Dolstra 2012-09-28 10:59:58 -04:00
parent af7c192f2a
commit 3e6bb7d1de
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/services/misc/nix-daemon.nix
View File

@ -319,10 +319,6 @@ in
system.activationScripts.nix = stringAfter [ "etc" "users" ]
''
# Set up Nix.
chown root:nixbld /nix/store
chmod 1775 /nix/store
# Nix initialisation.
mkdir -m 0755 -p \
/nix/var/nix/gcroots \
@ -334,9 +330,10 @@ in
/nix/var/log/nix/drvs \
/nix/var/nix/channel-cache \
/nix/var/nix/chroots
mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
mkdir -m 1777 -p /nix/var/nix/profiles/per-user
mkdir -m 1777 -p /nix/var/nix/gcroots/tmp
mkdir -m 1777 -p \
/nix/var/nix/gcroots/per-user \
/nix/var/nix/profiles/per-user \
/nix/var/nix/gcroots/tmp
ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/

2
modules/system/boot/stage-2-init.sh
View File

@ -43,6 +43,8 @@ fi
# Make /nix/store a read-only bind mount to enforce immutability of
# the Nix store.
chown root:nixbld /nix/store
chmod 1775 /nix/store
if [ -n "@readOnlyStore@" ]; then
if ! mountpoint /nix/store; then
mkdir -p /nix/rw-store