libs/sys: remove luci.sys.flash()

[project/luci.git] / modules / admin-core / root / sbin / luci-flash

diff --git a/modules/admin-core/root/sbin/luci-flash b/modules/admin-core/root/sbin/luci-flash
index 819be40..1874e8c 100755 (executable)
--- 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
 
 #!/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=""
 # 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
 
 # parse options
 while [ -n "$1" ]; do


@@ -85,5 +89,9 @@ done
 [ -n "$sysupgrade_init_conffiles" ] && do_save_conffiles
 run_hooks "" $sysupgrade_pre_upgrade
 
 [ -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