- early mounting of sysfs under kernel 2.5

svn-id: @1086

diff --git a/rc-scripts.spec.in b/rc-scripts.spec.in
index 47bf979d66dce20b2b8cb83ef9d64c10089a1f42..fa964c216118ea868d5a4085d7c2951056cd6029 100644 (file)
--- a/rc-scripts.spec.in
+++ b/rc-scripts.spec.in
@@ -1,4 +1,4 @@
-# $Id: rc-scripts.spec.in,v 1.57 2003/05/02 23:39:29 ankry Exp $
+# $Id: rc-scripts.spec.in,v 1.58 2003/06/16 20:20:21 blues Exp $
 Summary:       inittab and /etc/rc.d scripts
 Summary(de):   inittab und /etc/rc.d Scripts
 Summary(fr):   inittab et scripts /etc/rc.d
@@ -12,32 +12,33 @@ Group:              Base
 Source0:       %{name}-%{version}.tar.gz
 URL:           http://cvs.pld.org.pl/index.cgi/rc-scripts/
 Vendor:                PLD rc-scripts Team <pld-rc-scripts@pld.org.pl>
-BuildRequires: popt-devel
+BuildRequires: gettext-devel
 BuildRequires: glib-devel
 BuildRequires: glib-static
-BuildRequires: gettext-devel
-Requires:      grep
-Requires:      mingetty
-Requires:      mktemp
-Requires:      modutils >= 2.1.121
-Requires:      fileutils
-Requires:      textutils
-Requires:      sh-utils
-Requires:      /bin/nice
-Requires:      /bin/basename
+BuildRequires: popt-devel
 Requires:      /bin/awk
-Requires:      procps
+Requires:      /bin/basename
+Requires:      /bin/gettext
+Requires:      /bin/nice
 Requires:      /bin/ps
+Requires:      FHS >= 2.2-6
 Requires:      SysVinit
-Requires:      iproute2
-Requires:      /bin/gettext
+Requires:      bdflush
 Requires:      e2fsprogs >= 1.15
+Requires:      fileutils
+Requires:      grep
+Requires:      iproute2
+Requires:      mingetty
+Requires:      mktemp
+Requires:      modutils >= 2.1.121
 Requires:      mount >= 2.10
-Requires:      bdflush
-Requires:      utempter
 Requires:      net-tools
-Obsoletes:     initscripts
+Requires:      procps
+Requires:      sh-utils
+Requires:      textutils
+Requires:      utempter
 Provides:      initscripts
+Obsoletes:     initscripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 722938aa01de5635eaf77fdfc11b481821aa8eaa..3ff6e134c79ad7b7a468f87e91e34b6858798722 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # /etc/rc.d/rc.sysinit - run once at boot time
-# $Id: rc.sysinit,v 1.116 2003/06/16 18:05:37 arekm Exp $
+# $Id: rc.sysinit,v 1.117 2003/06/16 20:20:22 blues Exp $
 #
 # Taken in part from Miquel van Smoorenburg's bcheckrc.
 # Changes:     Arkadiusz Mi¶kiewicz <misiek@pld.org.pl>
@@ -17,6 +17,11 @@ export PATH
 # we need /proc mounted before everything
 mount -n -o gid=17 -t proc /proc /proc
 
+# sysfs is also needed before any other things (under kernel > 2.5)
+if grep -q sysfs; then
+    run_cmd "Mounting sysfs filesystem" mount -t sysfs sysfs /sys
+fi
+
 # Choose Hardware profile
 rm -f /var/run/hwprofile 2> /dev/null
 if [ -f /etc/sysconfig/hwprof ]; then