Annotation of /trunk/initscripts/patches/initscripts-0.7.0.3-mount-sys-only-if-required.patch
Parent Directory
| 
Revision Log
Revision 1731 -
(hide annotations)
(download)
Wed Apr 4 09:51:10 2012 UTC (12 years, 1 month ago) by niro
File size: 1476 byte(s)
Wed Apr 4 09:51:10 2012 UTC (12 years, 1 month ago) by niro
File size: 1476 byte(s)
-backport some pathes from head
| 1 | niro | 1731 | --- ../tags/init-0_7_0_3/busybox/rc/rc 2011-11-24 01:44:13.000000000 +0100 |
| 2 | +++ initscripts/busybox/rc/rc 2012-04-02 14:18:44.596982524 +0200 | ||
| 3 | @@ -53,11 +61,14 @@ | ||
| 4 | # mount sys file system before udev | ||
| 5 | if [ -d /sys ] | ||
| 6 | then | ||
| 7 | - rc_print "Mounting sysfs file system ..." | ||
| 8 | - mount -n -t sysfs sysfs /sys | ||
| 9 | - evaluate_retval | ||
| 10 | + if [ ! -e /sys/kernel/notes ] | ||
| 11 | + then | ||
| 12 | + rc_print "Mounting sysfs file system ..." | ||
| 13 | + mount -n -t sysfs sysfs /sys | ||
| 14 | + evaluate_retval | ||
| 15 | + fi | ||
| 16 | else | ||
| 17 | - rc_echo -e ${COLORED}"Fatal: mountpoint /sys missing ..." | ||
| 18 | + rc_echo -e ${COLRED}"Fatal: mountpoint /sys missing ..." | ||
| 19 | rc_echo -e ${COLYELLOW}"Please create the directory /sys (mkdir -p /sys)." | ||
| 20 | rc_echo -e ${COLYELLOW}"It's essential for a 2.6 kernel." | ||
| 21 | fi | ||
| 22 | --- ../tags/init-0_7_0_3/sysvinit/rc/rc 2011-11-24 01:44:15.000000000 +0100 | ||
| 23 | +++ initscripts/sysvinit/rc/rc 2012-04-02 14:19:06.428982524 +0200 | ||
| 24 | @@ -47,11 +55,14 @@ | ||
| 25 | # mount sys file system before udev | ||
| 26 | if [ -d /sys ] | ||
| 27 | then | ||
| 28 | - rc_print "Mounting sysfs file system ..." | ||
| 29 | - mount -n -t sysfs sysfs /sys | ||
| 30 | - evaluate_retval | ||
| 31 | + if [ ! -e /sys/kernel/notes ] | ||
| 32 | + then | ||
| 33 | + rc_print "Mounting sysfs file system ..." | ||
| 34 | + mount -n -t sysfs sysfs /sys | ||
| 35 | + evaluate_retval | ||
| 36 | + fi | ||
| 37 | else | ||
| 38 | - rc_echo -e ${COLORED}"Fatal: mountpoint /sys missing ..." | ||
| 39 | + rc_echo -e ${COLRED}"Fatal: mountpoint /sys missing ..." | ||
| 40 | rc_echo -e ${COLYELLOW}"Please create the directory /sys (mkdir -p /sys)." | ||
| 41 | rc_echo -e ${COLYELLOW}"It's essential for a 2.6 kernel." | ||
| 42 | fi |