From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 21 Apr 2005 22:19:21 +0000 (+0000)
Subject: move modules.d stuff in /etc/init.d/S10boot and make it more like /etc/modules
X-Git-Tag: reboot~33009
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4f9884d1be783f8130f9066e58d7085b15d1a40f;p=openwrt%2Fstaging%2Fnoltari.git

move modules.d stuff in /etc/init.d/S10boot and make it more like /etc/modules

SVN-Revision: 703
---

diff --git a/openwrt/package/openwrt/Makefile b/openwrt/package/openwrt/Makefile
index 01c830dc4a..ea2bfd8586 100644
--- a/openwrt/package/openwrt/Makefile
+++ b/openwrt/package/openwrt/Makefile
@@ -84,7 +84,7 @@ $(PKG_BUILD_DIR)/wlcompat-debug.o:
 $(PKG_WLCOMPAT): $(PKG_BUILD_DIR)/wlcompat.o $(PKG_BUILD_DIR)/wlcompat-debug.o
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/wlcompat kmod-wlcompat.control $(LINUX_VERSION)-$(PKG_RELEASE) $(ARCH)
 	mkdir -p $(PKG_BUILD_DIR)/wlcompat/etc/modules.d
-	echo "insmod wlcompat" > $(PKG_BUILD_DIR)/wlcompat/etc/modules.d/10-wlcompat
+	echo "wlcompat" > $(PKG_BUILD_DIR)/wlcompat/etc/modules.d/10-wlcompat
 	mkdir -p $(PKG_BUILD_DIR)/wlcompat/lib/modules/$(LINUX_VERSION)
 	cp $^ $(PKG_BUILD_DIR)/wlcompat/lib/modules/$(LINUX_VERSION)/
 	$(IPKG_BUILD) $(PKG_BUILD_DIR)/wlcompat $(PACKAGE_DIR)
diff --git a/openwrt/target/default/target_skeleton/etc/init.d/S10boot b/openwrt/target/default/target_skeleton/etc/init.d/S10boot
index 990480798b..47a255dd0f 100755
--- a/openwrt/target/default/target_skeleton/etc/init.d/S10boot
+++ b/openwrt/target/default/target_skeleton/etc/init.d/S10boot
@@ -25,7 +25,7 @@ touch /var/log/lastlog
   }
 }
 
-sed 's/^[^#]/insmod &/' /etc/modules 2>&-|ash
+cat /etc/modules /etc/modules.d/* | sed 's/^[^#]/insmod &/' 2>&-|ash
 
 ifconfig lo 127.0.0.1 up
 ifconfig eth0 promisc