From 1b89d29f57a7860737465e6a07490bf293d4c7cc Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 15 Apr 2005 20:12:17 +0000
Subject: load user-defined module scripts from /etc/sysconfig/modules at boot
 (#123927)

---
 Makefile         |  1 +
 initscripts.spec |  1 +
 rc.d/rc.sysinit  | 14 ++++++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 0c31350a..53a23abd 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,7 @@ install:
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/ifup-*
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/ifdown-*
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/init*
+	mkdir -p $(ROOT)/etc/sysconfig/modules
 	mkdir -p $(ROOT)/etc/sysconfig/networking/devices
 	mkdir -p $(ROOT)/etc/sysconfig/networking/profiles/default
 	#mv  $(ROOT)/etc/sysconfig/network-scripts/ifcfg-lo \
diff --git a/initscripts.spec b/initscripts.spec
index c0cef131..8d98924d 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -119,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sysconfig/network-scripts/ifup
 %config /sbin/ifup
 %dir /etc/sysconfig/console
+%dir /etc/sysconfig/modules
 %dir /etc/sysconfig/networking
 %dir /etc/sysconfig/networking/devices
 %dir /etc/sysconfig/networking/profiles
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 29e3f2e6..7d81ace2 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -215,6 +215,16 @@ echo -n $" done"
 success
 echo
 
+# Load other user-defined modules
+for file in /etc/sysconfig/modules/*.modules ; do
+  [ -x $file ] && $file
+done
+
+# Load modules (for backward compatibility with VARs)
+if [ -f /etc/rc.modules ]; then
+	/etc/rc.modules
+fi
+
 # Start the graphical boot, if necessary; /usr may not be mounted yet, so we
 # may have to do this again after mounting
 RHGB_STARTED=0
@@ -487,10 +497,6 @@ if [ -n "$SELINUX" -a strstr "$cmdline" autorelabel ]; then
    relabel_selinux
 fi
 
-# Load modules (for backward compatibility with VARs)
-if [ -f /etc/rc.modules ]; then
-	/etc/rc.modules
-fi
 
 # Start the graphical boot, if necessary and not done yet.
 if strstr "$cmdline" rhgb && ! strstr "$cmdline" early-login && [ "$RHGB_STARTED" -eq 0 -a "$BOOTUP" = "color" -a "$GRAPHICAL" = "yes" -a -x /usr/bin/rhgb ]; then
-- 
cgit v1.2.1