X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-core%2Froot%2Fsbin%2Fluci-flash;h=1874e8c656d107190a7a2883986ce4e9e7bec3c4;hp=819be40b570faf1ebbc790812363012e29b20a72;hb=3b5123937e901ee70cf5b602d7efcf83d23dc0ee;hpb=251502e2cd0c47b426cfd4d4f183128ca528b91b

diff --git a/modules/admin-core/root/sbin/luci-flash b/modules/admin-core/root/sbin/luci-flash
index 819be40b5..1874e8c65 100755
--- a/modules/admin-core/root/sbin/luci-flash
+++ b/modules/admin-core/root/sbin/luci-flash
@@ -1,11 +1,15 @@
 #!/bin/sh
 . /etc/functions.sh
 
+trap '' INT
+trap '' TERM
+trap '' PIPE
+
 # initialize defaults
 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 +89,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