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

[openwrt.git] / target / default / target_skeleton / etc / init.d / S10boot

diff --git a/target/default/target_skeleton/etc/init.d/S10boot b/target/default/target_skeleton/etc/init.d/S10boot
index e1f47ba..47a255d 100755 (executable)
--- a/target/default/target_skeleton/etc/init.d/S10boot
+++ b/target/default/target_skeleton/etc/init.d/S10boot
@@ -1,7 +1,6 @@
 #!/bin/sh
 klogd
 syslogd -C 16 
-sysctl -p
 echo "S" > /proc/jffs2_bbc
 
 mkdir -p /var/run
@@ -15,7 +14,8 @@ touch /var/log/lastlog
   awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}')
 }
 
-# set up the vlan*ports variables for the asus wl-500g deluxe, if they aren't exist
+# set up the vlan*ports variables for the asus wl-500g deluxe
+# if they don't already exist 
 [ "$(nvram get boardtype)" = "bcm95365r" ] && \
 [ "$(nvram get boardnum)" = "45" ] && {
   [ -z "$(nvram get vlan0ports)" ] && \
@@ -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
@@ -40,3 +40,5 @@ vconfig set_name_type VLAN_PLUS_VID_NO_PAD
 [ -z "$FAILSAFE" ] && {
        { mount | grep jffs2 1>&-; } || firstboot
 }
+
+sysctl -p