summaryrefslogtreecommitdiff
path: root/package/base-files/default/sbin
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-07-20 19:58:40 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-07-20 19:58:40 +0000
commita44985f42c551baae99a2c6f461c94ec86d9e310 (patch)
tree702dae2c4cb6b1e26b3c135cc3f3116b76dd5d84 /package/base-files/default/sbin
parent1d0d06f7a65d38875139a77b2529c62cd3bc487a (diff)
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/sbin')
-rwxr-xr-xpackage/base-files/default/sbin/ifup4
-rwxr-xr-xpackage/base-files/default/sbin/mount_root14
2 files changed, 11 insertions, 7 deletions
diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index 3d81364d08..5dac3f9987 100755
--- a/package/base-files/default/sbin/ifup
+++ b/package/base-files/default/sbin/ifup
@@ -12,6 +12,9 @@ if_valid $if || exit
mac=$(nvram get ${type}_hwaddr)
$DEBUG ifconfig $if down 2>&-
+pidfile=/var/run/${if}.pid
+[ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
+
if [ "${if%%[0-9]}" = "br" ]; then
stp=$(nvram get ${type}_stp)
$DEBUG brctl delbr $if 2>&-
@@ -47,7 +50,6 @@ case "$if_proto" in
;;
dhcp)
ip=$(nvram get ${type}_ipaddr)
- [ -f $pidfile ] && $DEBUG kill $(cat $pidfile)
${DEBUG:-eval} "udhcpc -R -i $if ${ip:+-r $ip} -b -p $pidfile &"
;;
none|"")
diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root
index b4ec2ca563..29c5126ba1 100755
--- a/package/base-files/default/sbin/mount_root
+++ b/package/base-files/default/sbin/mount_root
@@ -12,12 +12,14 @@ if [ "$1" != "failsafe" ]; then
mount -o remount,rw /dev/root /
fi
else
- mtd unlock OpenWrt
- mount -t jffs2 /dev/mtdblock/4 /jffs
- pivot_root /jffs /jffs/rom
- mount none /proc -t proc
- mount none /dev -t devfs
- umount /rom/proc rom/dev >&-
+ if [ -z "$(nvram get no_root_swap)" ]; then
+ mtd unlock OpenWrt
+ mount -t jffs2 /dev/mtdblock/4 /jffs
+ pivot_root /jffs /jffs/rom
+ mount none /proc -t proc
+ mount none /dev -t devfs
+ umount /rom/proc rom/dev >&-
+ fi
fi
fi
mount none /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=50%