[gentoo-commits] proj/openrc:master commit in: sh/

["William Hubbs" <williamh@gentoo.org>]

commit:     1d63e85794ad850752eec95fa077e5895295f3b7
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 23:27:35 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:14:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=1d63e857

rework test for mounted /proc

The previous test assumed that we could always rely on the minor fault
counter to change between reads of /proc/self/stat, but we found that
this is not the case.

The new test compares two reads of /proc/self/environ for which we have
set the same environment variable to two different values.
If the comparison shows the two reads have the same contents, we know
that /proc is not working.

I would like to thank Robin Johnson and Mike Frysinger for their input
for this patch.

X-Gentoo-Bug: 348416
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=348416

---
 sh/init.sh.Linux.in |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/sh/init.sh.Linux.in b/sh/init.sh.Linux.in
index 9b04557..361de0b 100644
--- a/sh/init.sh.Linux.in
+++ b/sh/init.sh.Linux.in
@@ -65,27 +65,21 @@ mount_svcdir()
 # By default VServer already has /proc mounted, but OpenVZ does not!
 # However, some of our users have an old proc image in /proc
 # NFC how they managed that, but the end result means we have to test if
-# /proc actually works or not. We to this by comparing two reads of
-# /proc/self/stat. They will not match, because at least the minor fault count
-# field (field 10) should have changed.
-#
-# We can use any file here that fills the following requirements:
-# - changes between sequential reads
-# - is world-readable (not blocked in hardened kernel)
-# - Is only a single line (ergo entire check is doable with no forks)
+# /proc actually works or not. We do this by comparing two reads of
+# /proc/self/environ for which we have set the variable VAR to two
+# different values. If the comparison comes back equal, we know that
+# /proc is not working.
 mountproc=true
-f=/proc/self/stat
+f=/proc/self/environ
 if [ -e $f ]; then
-	exec 9<$f ; read a <&9 ; exec 9<&-
-	exec 9<$f ; read b <&9 ; exec 9<&-
-	if [ "$a" = "$b" ]; then
+	if [ "$(VAR=a cat $f)" = "$(VAR=b cat $f)" ]; then
 		eerror "You have cruft in /proc that should be deleted"
 	else
 		einfo "/proc is already mounted, skipping"
 		mountproc=false
 	fi
 fi
-unset a b f
+unset f
 
 if $mountproc; then
 	procfs="proc"