diff options
| author | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-20 01:52:32 +0000 |
|---|---|---|
| committer | mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-04-20 01:52:32 +0000 |
| commit | 79e92078323a468e3e8d5a2c7c7481d9b7a91d97 (patch) | |
| tree | fd38181a25b1e22a65409bb8cb60eef3913e7c34 /target | |
| parent | 8f69e37a934992d4ee185241d10211c0d04e4b9d (diff) | |
minor fs changes & cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@686 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
4 files changed, 13 insertions, 14 deletions
diff --git a/target/default/target_skeleton/etc/init.d/S10boot b/target/default/target_skeleton/etc/init.d/S10boot index e1f47ba278..990480798b 100755 --- a/target/default/target_skeleton/etc/init.d/S10boot +++ b/target/default/target_skeleton/etc/init.d/S10boot @@ -1,7 +1,6 @@ #!/bin/sh klogd syslogd -C 16 -sysctl -p echo "S" > /proc/jffs2_bbc mkdir -p /var/run @@ -15,7 +14,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)" ] && \ @@ -40,3 +40,5 @@ vconfig set_name_type VLAN_PLUS_VID_NO_PAD [ -z "$FAILSAFE" ] && { { mount | grep jffs2 1>&-; } || firstboot } + +sysctl -p diff --git a/target/default/target_skeleton/etc/nvram.overrides b/target/default/target_skeleton/etc/nvram.overrides index 094db457b2..8132c08e72 100644 --- a/target/default/target_skeleton/etc/nvram.overrides +++ b/target/default/target_skeleton/etc/nvram.overrides @@ -6,11 +6,6 @@ # Load sysconf defaults [ -f /etc/sysconf ] && . /etc/sysconf -[ "$(nvram get boardnum)" = "asusX" ] && \ - [ "$(nvram get boardtype)" = "bcm94710dev" ] && { - asus=1 -} - # linksys bug; remove when not using static configuration for lan NVRAM_lan_proto="static" @@ -54,8 +49,9 @@ NVRAM_lan_proto="static" } # hack for asus wl-500g hardware -[ $asus ] && { - FAILSAFE_lan_ifnames="eth0 eth2" +[ "$(nvram get boardnum)" = "asusX" ] && \ +[ "$(nvram get boardtype)" = "bcm94710dev" ] && { + FAILSAFE_lan_ifnames="eth0 eth2" } # hacks for asus wl-500g deluxe diff --git a/target/default/target_skeleton/rom/note b/target/default/target_skeleton/rom/note index 4d9934e45d..1746eb0509 100644 --- a/target/default/target_skeleton/rom/note +++ b/target/default/target_skeleton/rom/note @@ -1,2 +1,3 @@ -After firstboot has been run, /rom will contain the previous (squashfs) root -* except when booted failsafe -- echo $FAILSAFE +SQUASHFS USERS: +After firstboot has been run, / will be jffs2 and /rom will be squashfs +(* except when in failsafe) diff --git a/target/default/target_skeleton/usr/share/udhcpc/default.script b/target/default/target_skeleton/usr/share/udhcpc/default.script index 996366ea1d..cc94a79270 100755 --- a/target/default/target_skeleton/usr/share/udhcpc/default.script +++ b/target/default/target_skeleton/usr/share/udhcpc/default.script @@ -1,6 +1,6 @@ #!/bin/sh # udhcpc script edited by Tim Riker <Tim@Rikers.org> -# (slightly modified) +# (slightly modified for openwrt) [ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1 @@ -13,8 +13,8 @@ case "$1" in renew|bound) ifconfig $interface $ip \ - netmask ${subnet:-255.255.255.0} \ - broadcast ${broadcast:-+} + netmask ${subnet:-255.255.255.0} \ + broadcast ${broadcast:-+} if [ -n "$router" ] ; then echo "deleting routers" |