summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-20 03:24:43 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-04-20 03:24:43 +0000
commit16ddb9350ab127ce50cb52211c7f361bd98a9367 (patch)
tree7eda9680af74e60f002ad688b82a0dbacc43fb84 /package
parent6598df69d10b1b80469b6238fdd13fb6d9dbc67b (diff)
remove some redundant code
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10870 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/files/etc/preinit27
1 files changed, 15 insertions, 12 deletions
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 452209ff90..66bb1a5cc1 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -59,17 +59,20 @@ set_state preinit
echo "$HOTPLUG" > /proc/sys/kernel/hotplug
eval ${FAILSAFE:+failsafe}
lock -w /tmp/.failsafe
-mount_root
-[ -f /sysupgrade.tgz ] && {
- echo "- config restore -"
- cd /
- mv sysupgrade.tgz /tmp
- tar xzf /tmp/sysupgrade.tgz
- rm -f /tmp/sysupgrade.tgz
- sync
-}
-echo "- init -"
+if [ -z "$INITRAMFS" ]; then
+ mount_root
+ [ -f /sysupgrade.tgz ] && {
+ echo "- config restore -"
+ cd /
+ mv sysupgrade.tgz /tmp
+ tar xzf /tmp/sysupgrade.tgz
+ rm -f /tmp/sysupgrade.tgz
+ sync
+ }
+
+ echo "- init -"
-killall hotplug2
-exec /sbin/init
+ killall hotplug2
+ exec /sbin/init
+fi