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 bb22db0..47a255d 100755 (executable)
--- a/target/default/target_skeleton/etc/init.d/S10boot
+++ b/target/default/target_skeleton/etc/init.d/S10boot
@@ -1,11 +1,8 @@
 #!/bin/sh
 klogd
 syslogd -C 16 
 #!/bin/sh
 klogd
 syslogd -C 16 

-sysctl -p

 echo "S" > /proc/jffs2_bbc
 
 echo "S" > /proc/jffs2_bbc
 

-rm -rf /var
-ln -sf /tmp /var

 mkdir -p /var/run
 mkdir -p /var/log
 touch /var/log/wtmp
 mkdir -p /var/run
 mkdir -p /var/log
 touch /var/log/wtmp


@@ -17,7 +14,18 @@ touch /var/log/lastlog
   awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}')
 }
 
   awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}')
 }
 

-sed 's/^[^#]/insmod &/' /etc/modules 2>&-|ash
+# 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)" ] && \
+  [ -z "$(nvram get vlan1ports)" ] && {
+    nvram set vlan0ports="1 2 3 4 5*"
+    nvram set vlan1ports="0 5"
+  }
+}
+
+cat /etc/modules /etc/modules.d/* | sed 's/^[^#]/insmod &/' 2>&-|ash

 
 ifconfig lo 127.0.0.1 up
 ifconfig eth0 promisc
 
 ifconfig lo 127.0.0.1 up
 ifconfig eth0 promisc


@@ -27,3 +35,10 @@ HOSTNAME=${HOSTNAME%%.*}
 echo ${HOSTNAME:=OpenWrt} > /proc/sys/kernel/hostname
 
 vconfig set_name_type VLAN_PLUS_VID_NO_PAD
 echo ${HOSTNAME:=OpenWrt} > /proc/sys/kernel/hostname
 
 vconfig set_name_type VLAN_PLUS_VID_NO_PAD

+
+# automagically run firstboot
+[ -z "$FAILSAFE" ] && {
+       { mount | grep jffs2 1>&-; } || firstboot
+}
+
+sysctl -p