summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-21 22:19:21 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-21 22:19:21 +0000
commit04aeac79ae518945af8fa22df2555f79a4e938c9 (patch)
tree02b3697aa1a04444b1bf6208e004370762f2bfe7
parentd2f4cca420ecfa2410a7c8149dd342ab3901848e (diff)
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/openwrt@703 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/openwrt/Makefile2
-rwxr-xr-xtarget/default/target_skeleton/etc/init.d/S10boot2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/openwrt/Makefile b/package/openwrt/Makefile
index 01c830dc4..ea2bfd858 100644
--- a/package/openwrt/Makefile
+++ b/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/target/default/target_skeleton/etc/init.d/S10boot b/target/default/target_skeleton/etc/init.d/S10boot
index 990480798..47a255dd0 100755
--- a/target/default/target_skeleton/etc/init.d/S10boot
+++ b/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