Author: eelco
Date: Sat Jul 16 19:27:45 2011
New Revision: 27803
URL: https://svn.nixos.org/websvn/nix/?rev=27803&sc=1
Log:
* The Powers That Be have decided that there shall be a /run to
replace /var/run and /var/lock. For instance, udev now keeps state
in /run/udev instead of /dev/.udev. See
http://lists.fedoraproject.org/pipermail/devel/2011-March/150031.html
http://bugs.freestandards.org/show_bug.cgi?id=718
So this patch creates /run as a tmpfs, and symlinks /var/run to /run
and /var/lock to /run/lock.
TODO: create /run in stage 1 and propagate it to stage 2.
Modified:
nixos/trunk/modules/services/network-filesystems/samba.nix
nixos/trunk/modules/system/boot/stage-2-init.sh
nixos/trunk/modules/system/upstart-events/shutdown.nix
Modified: nixos/trunk/modules/services/network-filesystems/samba.nix
==============================================================================
--- nixos/trunk/modules/services/network-filesystems/samba.nix Sat Jul 16
18:40:08 2011 (r27802)
+++ nixos/trunk/modules/services/network-filesystems/samba.nix Sat Jul 16
19:27:45 2011 (r27803)
@@ -16,8 +16,6 @@
setupScript =
''
- mkdir -p /var/lock
-
if ! test -d /home/smbd ; then
mkdir -p /home/smbd
chown ${user} /home/smbd
Modified: nixos/trunk/modules/system/boot/stage-2-init.sh
==============================================================================
--- nixos/trunk/modules/system/boot/stage-2-init.sh Sat Jul 16 18:40:08
2011 (r27802)
+++ nixos/trunk/modules/system/boot/stage-2-init.sh Sat Jul 16 19:27:45
2011 (r27803)
@@ -98,9 +98,7 @@
# Miscellaneous boot time cleanup.
-rm -rf /var/run
-rm -rf /var/lock
-rm -rf /var/log/upstart
+rm -rf /run /var/run /var/lock /var/log/upstart
#echo -n "cleaning \`/tmp'..."
#rm -rf --one-file-system /tmp/*
@@ -123,14 +121,17 @@
rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots
-# Use a tmpfs for /var/run to ensure that / or /var can be unmounted
-# or at least remounted read-only during shutdown. (Upstart 0.6
-# apparently uses nscd to do some name lookups, resulting in it
-# holding some mmap mapping to deleted files in /var/run/nscd.
-# Similarly, portmap and statd have open files in /var/run and are
-# needed during shutdown to unmount NFS volumes.)
-mkdir -m 0755 -p /var/run
-mount -t tmpfs -o "mode=755" none /var/run
+# Create a tmpfs on /run to hold runtime state for programs such as
+# udev.
+mkdir -m 0755 -p /run
+mount -t tmpfs -o "mode=755" none /run
+mkdir -m 0700 -p /run/lock
+
+
+# For backwards compatibility, symlink /var/run to /run, and /var/lock
+# to /run/lock.
+ln -s /run /var/run
+ln -s /run/lock /var/lock
# Clear the resume device.
Modified: nixos/trunk/modules/system/upstart-events/shutdown.nix
==============================================================================
--- nixos/trunk/modules/system/upstart-events/shutdown.nix Sat Jul 16
18:40:08 2011 (r27802)
+++ nixos/trunk/modules/system/upstart-events/shutdown.nix Sat Jul 16
19:27:45 2011 (r27803)
@@ -94,7 +94,7 @@
# Skip various special filesystems. Non-existent
# mount points are typically tmpfs/aufs mounts from
# the initrd.
- if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o
"$device" = "rootfs" -o "$mp" = /var/run -o ! -e "$mp" ]; then continue; fi
+ if [ "$mp" = /proc -o "$mp" = /sys -o "$mp" = /dev -o
"$device" = "rootfs" -o "$mp" = /run -o "$mp" = /var/run -o "$mp" = /var/lock
-o ! -e "$mp" ]; then continue; fi
echo "unmounting $mp..."
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
