diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-09 03:28:40 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-05-09 03:28:40 +0000 |
| commit | 667d88fb277b4ecb9d6adea67e8373e7dc70344d (patch) | |
| tree | f4e448c76449751952cb41bb0ea7bc62f744f1e0 /modules/admin-core | |
| parent | 9edf0dbb7c83594e1abedb2f264edf612079b470 (diff) | |
luci-0.8: merge r4482 - r4487
Diffstat (limited to 'modules/admin-core')
| -rwxr-xr-x | modules/admin-core/root/sbin/luci-flash | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/admin-core/root/sbin/luci-flash b/modules/admin-core/root/sbin/luci-flash index 819be40b57..a9ddc87f2e 100755 --- a/modules/admin-core/root/sbin/luci-flash +++ b/modules/admin-core/root/sbin/luci-flash @@ -5,7 +5,7 @@ RAMFS_COPY_BIN="/usr/bin/awk" # extra programs for temporary ramfs root RAMFS_COPY_DATA="" # extra data files export KEEP_PATTERN="" -export VERBOSE=0 +export VERBOSE=1 # parse options while [ -n "$1" ]; do @@ -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 |