[sysupgrade] Don't try to pivot to new ramfs if already running on one

This patch allows the sysupgrade script to continue with the upgrade if
openwrt is already running on a ramfs. This allows the use of the sysupgrade
script as an _installer_ when running from an iso image. A user could boot the
system from a bootable cd and invoke sysupgrade -n <URL> to write an image to
the hard disk or CF.

Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
SVN-Revision: 15683

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 83cc95682f19f5fc0a6e0829a05f2f473a890ada..139135e8f78a49939cef7b638a407b83adc1d309 100755 (executable)
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -109,5 +109,9 @@ else
 fi
 run_hooks "" $sysupgrade_pre_upgrade
 
-v "Switching to ramdisk..."
-run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'
+if [ -n "$(rootfs_type)" ]; then
+       v "Switching to ramdisk..."
+       run_ramfs '. /etc/functions.sh; include /lib/upgrade; do_upgrade'
+else
+       do_upgrade
+fi
\ No newline at end of file