From 5ba4ad52e20de57509917494d22e7f43fb7b324b Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 18 Sep 2007 15:45:15 +0000 Subject: Only mount /sys if it's not mounted, #192436. --- ChangeLog | 2 ++ sh.Linux/init.sh | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cbe91069..4cc1f3c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ 18 Sep 2007; Roy Marples : + Only mount /sys if it's not mounted, #192436. + API changes! rc_ls_dir, rc_get_config and rc_get_list no longer take a starting list diff --git a/sh.Linux/init.sh b/sh.Linux/init.sh index bc4fd9d7..ab93f23c 100755 --- a/sh.Linux/init.sh +++ b/sh.Linux/init.sh @@ -140,10 +140,12 @@ K26=$? if [ "${RC_UNAME}" != "GNU/kFreeBSD" -a "${RC_SYS}" != "VPS" -a "${K26}" = "0" ] ; then if [ -d /sys ] ; then - ebegin "Mounting sysfs at /sys" - mntcmd="$(fstabinfo --mountcmd /sys)" - try mount -n ${mntcmd:--t sysfs -o noexec,nosuid,nodev sysfs /sys} - eend $? + if ! mountinfo --quiet /sys ; then + ebegin "Mounting sysfs at /sys" + mntcmd="$(fstabinfo --mountcmd /sys)" + try mount -n ${mntcmd:--t sysfs -o noexec,nosuid,nodev sysfs /sys} + eend $? + fi else ewarn "No /sys to mount sysfs needed in 2.6 and later kernels!" fi -- cgit v1.2.3