summaryrefslogtreecommitdiff
path: root/openwrt/package/base-files/default/etc/init.d/S10boot
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2005-07-20 19:58:40 +0000
committerMike Baker <mbm@openwrt.org>2005-07-20 19:58:40 +0000
commit6a4f0e2b5488b191d8d96482717f56984bc2e386 (patch)
treec955985cd7d6588cb3e96865f49181f809cf2b85 /openwrt/package/base-files/default/etc/init.d/S10boot
parent5ea9dc5f57a7c9fe3fd6fc891a3e3409986da2de (diff)
downloadmtk-20170518-6a4f0e2b5488b191d8d96482717f56984bc2e386.zip
mtk-20170518-6a4f0e2b5488b191d8d96482717f56984bc2e386.tar.gz
mtk-20170518-6a4f0e2b5488b191d8d96482717f56984bc2e386.tar.bz2
updates from whiterussian
SVN-Revision: 1504
Diffstat (limited to 'openwrt/package/base-files/default/etc/init.d/S10boot')
-rwxr-xr-xopenwrt/package/base-files/default/etc/init.d/S10boot5
1 files changed, 3 insertions, 2 deletions
diff --git a/openwrt/package/base-files/default/etc/init.d/S10boot b/openwrt/package/base-files/default/etc/init.d/S10boot
index 22096d5..ead7352 100755
--- a/openwrt/package/base-files/default/etc/init.d/S10boot
+++ b/openwrt/package/base-files/default/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
}