add some changes from whiterussian to head

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

diff --git a/openwrt/target/default/target_skeleton/etc/init.d/S10boot b/openwrt/target/default/target_skeleton/etc/init.d/S10boot
index 0722dc0..22096d5 100755 (executable)
--- a/openwrt/target/default/target_skeleton/etc/init.d/S10boot
+++ b/openwrt/target/default/target_skeleton/etc/init.d/S10boot
@@ -1,6 +1,4 @@
 #!/bin/sh
-klogd
-syslogd -C 16 
 echo "S" > /proc/jffs2_bbc
 
 mkdir -p /var/run
@@ -16,27 +14,25 @@ touch /var/log/lastlog
 
 # 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"
-  }
+[  "$(nvram get boardtype)" = "bcm95365r" \
+-a "$(nvram get boardnum)" = "45" \
+-a -z "$(nvram get vlan0ports)$(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
+sed 's/^[^#]/insmod &/' /etc/modules /etc/modules.d/* 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 jffs2 1>&-; } || firstboot
+       { mount|grep "on / type jffs2" 1>&-; } || firstboot
 }