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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@703 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/openwrt/Makefile b/openwrt/package/openwrt/Makefile
index 01c830d..ea2bfd8 100644 (file)
--- 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 9904807..47a255d 100755 (executable)
--- 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