base-files: fix whitespaces

[openwrt/staging/chunkeey.git] / package / base-files / files / lib / upgrade / common.sh

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 6bb36db489302bbd592e1a261ee16e2c9a6e8f53..15ee70325b5c6fc3a0207ad34ca7f75846962207 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -38,7 +38,7 @@ supivot() { # <new_root> <old_root>
        mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
        mount -o noatime,move /proc $1/proc && \
        pivot_root $1 $1$2 || {
-        umount -l $1 $1
+               umount -l $1 $1
                return 1
        }
 
@@ -50,10 +50,10 @@ supivot() { # <new_root> <old_root>
 }
 
 run_ramfs() { # <command> [...]
-       install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount        \
-               /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd   \
-               /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" \
-               /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump          \
+       install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount        \
+               /sbin/pivot_root /usr/bin/wget /sbin/reboot /bin/sync /bin/dd   \
+               /bin/grep /bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" \
+               /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump          \
                /bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc
 
        install_bin /sbin/mtd
@@ -94,12 +94,12 @@ kill_remaining() { # [ <signal> ]
                local cmdline
                read cmdline < /proc/$pid/cmdline
 
-               # Skip kernel threads 
+               # Skip kernel threads
                [ -n "$cmdline" ] || continue
 
                case "$name" in
                        # Skip essential services
-                       *procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*) : ;;
+                       *procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*|*nas*) : ;;
 
                        # Killable process
                        *)
@@ -175,10 +175,6 @@ get_magic_long() {
        get_image "$@" | dd bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
 }
 
-refresh_mtd_partitions() {
-       mtd refresh rootfs
-}
-
 jffs2_copy_config() {
        if grep rootfs_data /proc/mtd >/dev/null; then
                # squashfs+jffs2
@@ -191,8 +187,8 @@ jffs2_copy_config() {
 
 default_do_upgrade() {
        sync
-       if [ "$SAVE_CONFIG" -eq 1 -a -z "$USE_REFRESH" ]; then
-               get_image "$1" | mtd -j "$CONF_TAR" write - "${PART_NAME:-image}"
+       if [ "$SAVE_CONFIG" -eq 1 ]; then
+               get_image "$1" | mtd $MTD_CONFIG_ARGS -j "$CONF_TAR" write - "${PART_NAME:-image}"
        else
                get_image "$1" | mtd write - "${PART_NAME:-image}"
        fi
@@ -206,19 +202,10 @@ do_upgrade() {
                default_do_upgrade "$ARGV"
        fi
 
-       [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && {
-               v "Refreshing partitions"
-               if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then
-                       platform_refresh_partitions
-               else
-                       refresh_mtd_partitions
-               fi
-               if type 'platform_copy_config' >/dev/null 2>/dev/null; then
-                       platform_copy_config
-               else
-                       jffs2_copy_config
-               fi
-       }
+       if [ "$SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then
+               platform_copy_config
+       fi
+
        v "Upgrade completed"
        [ -n "$DELAY" ] && sleep "$DELAY"
        ask_bool 1 "Reboot" && {