From 0a7a66c30b14a1d0c6e74569048021b7b81e3778 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Wed, 20 Jul 2005 20:20:01 +0000
Subject: [PATCH] misc cleanup

SVN-Revision: 1505
---
 .../target/default/target_skeleton/etc/firewall.user  |  2 +-
 .../target/default/target_skeleton/etc/init.d/S10boot |  5 +++--
 openwrt/target/default/target_skeleton/etc/init.d/rcS |  2 +-
 openwrt/target/default/target_skeleton/etc/preinit    | 11 ++++++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/openwrt/target/default/target_skeleton/etc/firewall.user b/openwrt/target/default/target_skeleton/etc/firewall.user
index 1781bd4ea0..7a13141623 100755
--- a/openwrt/target/default/target_skeleton/etc/firewall.user
+++ b/openwrt/target/default/target_skeleton/etc/firewall.user
@@ -14,7 +14,7 @@ iptables -t nat -F postrouting_rule
 ### The "-i $WAN" literally means packets that came in over the $WAN interface;
 ### this WILL NOT MATCH packets sent from the LAN to the WAN address.
 
-### Allow SSH from WAN
+### Allow SSH on the WAN interface
 # iptables -t nat -A prerouting_rule -i $WAN -p tcp --dport 22 -j ACCEPT 
 # iptables        -A input_rule      -i $WAN -p tcp --dport 22 -j ACCEPT
 
diff --git a/openwrt/target/default/target_skeleton/etc/init.d/S10boot b/openwrt/target/default/target_skeleton/etc/init.d/S10boot
index 22096d5fbb..ead73521b1 100755
--- a/openwrt/target/default/target_skeleton/etc/init.d/S10boot
+++ b/openwrt/target/default/target_skeleton/etc/init.d/S10boot
@@ -16,7 +16,8 @@ touch /var/log/lastlog
 # if they don't already exist 
 [  "$(nvram get boardtype)" = "bcm95365r" \
 -a "$(nvram get boardnum)" = "45" \
--a -z "$(nvram get vlan0ports)$(nvram get vlan1ports)" ] && {
+-a -z "$(nvram get vlan0ports)"
+-a -z "$(nvram get vlan1ports)" ] && {
 	nvram set vlan0ports="1 2 3 4 5*"
 	nvram set vlan1ports="0 5"
 }
@@ -33,6 +34,6 @@ echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
 vconfig set_name_type VLAN_PLUS_VID_NO_PAD
 
 # automagically run firstboot
-[ -z "$FAILSAFE" ] && {
+[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
 	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
 }
diff --git a/openwrt/target/default/target_skeleton/etc/init.d/rcS b/openwrt/target/default/target_skeleton/etc/init.d/rcS
index 969fefe937..706585801c 100755
--- a/openwrt/target/default/target_skeleton/etc/init.d/rcS
+++ b/openwrt/target/default/target_skeleton/etc/init.d/rcS
@@ -1,6 +1,6 @@
 #!/bin/sh
 syslog_ip=$(nvram get log_ipaddr)
-ipcalc -s $syslog_ip || syslog_ip=""
+ipcalc -s "$syslog_ip" || syslog_ip=""
 syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
 klogd
 #${FAILSAFE:+telnetd -l /bin/login; ifup lan; exit}
diff --git a/openwrt/target/default/target_skeleton/etc/preinit b/openwrt/target/default/target_skeleton/etc/preinit
index 0c59893f75..b23f8833ef 100755
--- a/openwrt/target/default/target_skeleton/etc/preinit
+++ b/openwrt/target/default/target_skeleton/etc/preinit
@@ -1,17 +1,18 @@
 #!/bin/sh
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
 insmod diag
 echo 0x01 > /proc/sys/diag
 sleep 1
-if [ $(cat /proc/sys/reset) = 1 ] || [ "$(/usr/sbin/nvram get failsafe)" = 1 ]; then
+if [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then
 	export FAILSAFE=true
-	[ "$(/usr/sbin/nvram get boot_wait)" != "on" ] && {
-		/usr/sbin/nvram set boot_wait=on
-		/usr/sbin/nvram commit
+	[ "$(nvram get boot_wait)" != "on" ] && {
+		nvram set boot_wait=on
+		nvram commit
 	}
 	while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
 fi
 
-/sbin/mount_root ${FAILSAFE:+failsafe}
+mount_root ${FAILSAFE:+failsafe}
 
 exec /sbin/init
-- 
2.30.2