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

Revert "Don't mount /nix/store ro if it's a mountpoint"

Browse Source 
Now that nixUnstable supports remounting in the "/nix/store is a
mountpoint" case, this is no longer necessary.

This reverts commit f1d48aec43.

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-03-26 12:18:57 -04:00
parent 991a78dd8b
commit 89dd7b0f69
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/system/boot/readonly-mountpoint.c
View File

@ -8,7 +8,7 @@ int main(int argc, char ** argv) {
fprintf(stderr, "Usage: %s PATH", argv[0]); fprintf(stderr, "Usage: %s PATH", argv[0]);
exit(2); exit(2);
} }
if (statvfs(argv[1], &stat) != 0) { if(statvfs(argv[1], &stat) != 0) {
perror("statvfs"); perror("statvfs");
exit(3); exit(3);
} }

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

@ -51,7 +51,7 @@ echo "booting system configuration $systemConfig" > /dev/kmsg
chown 0:30000 /nix/store chown 0:30000 /nix/store
chmod 1775 /nix/store chmod 1775 /nix/store
if [ -n "@readOnlyStore@" ]; then if [ -n "@readOnlyStore@" ]; then
if ! mountpoint /nix/store; then if ! readonly-mountpoint /nix/store; then
mount --bind /nix/store /nix/store mount --bind /nix/store /nix/store
mount -o remount,ro,bind /nix/store mount -o remount,ro,bind /nix/store
fi fi