fix mountproc check for /sys and remove 2.4 kernel check code

This commit is contained in:
silvan 2011-04-29 21:32:57 +02:00
parent bf8757b8e2
commit 24c9810503

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# mountproc - mount /proc and /sysfs (kernel 2.6.x only) # mountproc - mount /proc and /sysfs (kernel 2.6.x only)
# Copyright (C) 2004-2010 Silvan Calarco <silvan.calarco@mambasoft.it> # Copyright (C) 2004-2011 Silvan Calarco <silvan.calarco@mambasoft.it>
# Copyright (C) 2004-2009 Davide Madrisan <davide.madrisan@gmail.com> # Copyright (C) 2004-2009 Davide Madrisan <davide.madrisan@gmail.com>
. /etc/sysconfig/rc . /etc/sysconfig/rc
@ -11,8 +11,6 @@ LC_ALL=$LANG
TEXTDOMAIN=initscripts TEXTDOMAIN=initscripts
TEXTDOMAINDIR=/usr/share/locale/ TEXTDOMAINDIR=/usr/share/locale/
KERNELMIN=`uname -r | sed -e 's,[^\.]*\.,,' -e 's,\..*,,'`
if [ ! -e /proc/version ]; then if [ ! -e /proc/version ]; then
echo -n "Mounting proc file system: " echo -n "Mounting proc file system: "
mount -n -t proc proc /proc mount -n -t proc proc /proc
@ -25,7 +23,7 @@ progress=5
$PLYMOUTH message --text=$"System booting, please wait..." $PLYMOUTH message --text=$"System booting, please wait..."
$PLYMOUTH update --status="$progress" $PLYMOUTH update --status="$progress"
if [ "$KERNELMIN" -ge 6 -a -z "`mount | grep "^sysfs "`" ]; then if [ ! -e /sys/kernel ]; then
echo -n "Mounting sys file system: " echo -n "Mounting sys file system: "
mount -n -t sysfs sysfs /sys mount -n -t sysfs sysfs /sys
evaluate_retval evaluate_retval