switch to a more reliable mechanism for running firstboot

[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 1a36583..f45eafb 100755 (executable)
--- a/target/default/target_skeleton/etc/init.d/S10boot
+++ b/target/default/target_skeleton/etc/init.d/S10boot
@@ -1,7 +1,4 @@
 #!/bin/sh
-klogd
-syslogd -C 16 
-sysctl -p
 echo "S" > /proc/jffs2_bbc
 
 mkdir -p /var/run
@@ -15,7 +12,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,13 +23,18 @@ 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
 
 HOSTNAME=$(nvram get wan_hostname)
 HOSTNAME=${HOSTNAME%%.*}
-echo ${HOSTNAME:=OpenWrt} > /proc/sys/kernel/hostname
+echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
 
 vconfig set_name_type VLAN_PLUS_VID_NO_PAD
+
+# automagically run firstboot
+[ -z "$FAILSAFE" ] && {
+       { mount|grep "on / type jffs2" 1>&-; } || firstboot
+}