diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-07 14:20:09 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-07 14:20:09 +0000 |
| commit | 8cebaa45d6cd56347d18ab7c18fe6d6cf0040d0b (patch) | |
| tree | 5a23bbf5e73b24bea101544cb3ac2c87b09c6fa0 | |
| parent | e4d0d97fbbbe578a9d1d4524ccc61949b98305b0 (diff) | |
[PATCH] Don't try to pivot to new ramfs if already running on one
This patch allows the luci-flash script to continue with the upgrade if
openwrt is already running on a ramfs. This allows the use of luci-flash
as an _installer_ when running from an iso image. A user could boot the
system from a bootable cd and write an image to the hard disk or CF from
the Flash Firmware page.
Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
| -rwxr-xr-x | modules/admin-core/root/sbin/luci-flash | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/admin-core/root/sbin/luci-flash b/modules/admin-core/root/sbin/luci-flash index 819be40b5..5600cddec 100755 --- a/modules/admin-core/root/sbin/luci-flash +++ b/modules/admin-core/root/sbin/luci-flash @@ -85,5 +85,9 @@ done [ -n "$sysupgrade_init_conffiles" ] && do_save_conffiles 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 |