From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R3JXj-0002ad-Li for garchives@archives.gentoo.org; Tue, 13 Sep 2011 03:20:16 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DF2821C1B0; Tue, 13 Sep 2011 03:20:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CDD5E21C1B0 for ; Tue, 13 Sep 2011 03:20:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 488EE66A46 for ; Tue, 13 Sep 2011 03:20:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A9CDC80042 for ; Tue, 13 Sep 2011 03:20:06 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/init-early.sh.Linux.in sh/init.sh.Linux.in X-VCS-Directories: sh/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: e14e78db16b8ce38235665ee52e3c13375e0d168 Date: Tue, 13 Sep 2011 03:20:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0703fdc6184ba47ce92893b4d3681032 commit: e14e78db16b8ce38235665ee52e3c13375e0d168 Author: Christian Ruppert gentoo org> AuthorDate: Mon Sep 12 15:46:51 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Sep 13 03:15:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3De14e78db Revert "Mount /run as early as possible" This reverts commit 5ed4d084d95608e40cb21888c18a8f381a44cd69. /run needs to be mounted after /proc. --- sh/init-early.sh.Linux.in | 18 ------------------ sh/init.sh.Linux.in | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sh/init-early.sh.Linux.in b/sh/init-early.sh.Linux.in index 83464f3..f546951 100644 --- a/sh/init-early.sh.Linux.in +++ b/sh/init-early.sh.Linux.in @@ -5,24 +5,6 @@ : ${CONSOLE:=3D/dev/console} : ${RC_LIBEXECDIR:=3D@LIBEXECDIR@} =20 -# 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=3D0755,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=3D"%G" kmode=3D"-u" diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in index d01cc7b..f86c5f2 100644 --- a/sh/init.sh.Linux.in +++ b/sh/init.sh.Linux.in @@ -91,6 +91,24 @@ if $mountproc; then eend $? fi =20 +# 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=3D0755,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 alway= s # 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