aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2011-09-12 17:46:51 +0200
committerWilliam Hubbs <w.d.hubbs@gmail.com>2011-09-12 22:15:24 -0500
commite14e78db16b8ce38235665ee52e3c13375e0d168 (patch)
tree5440a8972b51e95b5c49801448dfe330cc4a2514
parent2d180551ef5f2541e22a5eaf90b4efc7aadba914 (diff)
Revert "Mount /run as early as possible"
This reverts commit 5ed4d084d95608e40cb21888c18a8f381a44cd69. /run needs to be mounted after /proc.
-rw-r--r--sh/init-early.sh.Linux.in18
-rw-r--r--sh/init.sh.Linux.in18
2 files changed, 18 insertions, 18 deletions
diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in
index 83464f3d..f5469511 100644
--- a/sh/init-early.sh.Linux.in
+++ b/sh/init-early.sh.Linux.in
@@ -5,24 +5,6 @@
: ${CONSOLE:=/dev/console}
: ${RC_LIBEXECDIR:=@LIBEXECDIR@}
-# Mount tmpfs on /run when directory exists.
-# /run is a new directory for storing volatile runtime data.
-# Read more about /run at https://lwn.net/Articles/436012
-if [ -d /run ]; then
- if mountinfo -q /run; then
- einfo "/run is already mounted, skipping"
- else
- ebegin "Mounting /run"
- if ! fstabinfo --mount /run; then
- mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run
- fi
- eend $?
- fi
- checkpath -d -m 0775 -o root:uucp /run/lock
-elif [ -e /run ]; then
- einfo "Unable to mount /run since it is not a directory"
-fi
-
if [ -e "$RC_LIBEXECDIR"/console/unicode ]; then
termencoding="%G"
kmode="-u"
diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in
index d01cc7b7..f86c5f26 100644
--- a/sh/init.sh.Linux.in
+++ b/sh/init.sh.Linux.in
@@ -91,6 +91,24 @@ if $mountproc; then
eend $?
fi
+# Mount tmpfs on /run when directory exists.
+# /run is a new directory for storing volatile runtime data.
+# Read more about /run at https://lwn.net/Articles/436012
+if [ -d /run ]; then
+ if mountinfo -q /run; then
+ einfo "/run is already mounted, skipping"
+ else
+ ebegin "Mounting /run"
+ if ! fstabinfo --mount /run; then
+ mount -t tmpfs -o mode=0755,nosuid,nodev tmpfs /run
+ fi
+ eend $?
+ fi
+ checkpath -d -m 0775 -o root:uucp /run/lock
+elif [ -e /run ]; then
+ einfo "Unable to mount /run since it is not a directory"
+fi
+
# Try to mount xenfs as early as possible, otherwise rc_sys() will always
# return RC_SYS_XENU and will think that we are in a domU while it's not.
if grep -Eq "[[:space:]]+xenfs$" /proc/filesystems; then