diff options
| author | Mike Baker <mbm@openwrt.org> | 2005-07-20 19:58:40 +0000 |
|---|---|---|
| committer | Mike Baker <mbm@openwrt.org> | 2005-07-20 19:58:40 +0000 |
| commit | 3954f5bb6270b5b7291fbd4c09c4f8e6c88c5f42 (patch) | |
| tree | 702dae2c4cb6b1e26b3c135cc3f3116b76dd5d84 /package/base-files/default/etc/init.d/S10boot | |
| parent | f1c0a4e24379c4c0996101563821606a6a6cdceb (diff) | |
| download | master-187ad058-3954f5bb6270b5b7291fbd4c09c4f8e6c88c5f42.tar.gz master-187ad058-3954f5bb6270b5b7291fbd4c09c4f8e6c88c5f42.tar.bz2 master-187ad058-3954f5bb6270b5b7291fbd4c09c4f8e6c88c5f42.zip | |
updates from whiterussian
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1504 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/default/etc/init.d/S10boot')
| -rwxr-xr-x | package/base-files/default/etc/init.d/S10boot | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot index 22096d5fbb..ead73521b1 100755 --- a/package/base-files/default/etc/init.d/S10boot +++ b/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 } |