ramips: keep Archer C20 Power LED On during boot

[openwrt/.git] / package / system / fstools / files / snapshot

diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot
index 85a0076d8e60d5743c54c410a8ac239b936b883d..a495e3434523b7a4b1b2f1bc3f4c9298197fc745 100644 (file)
--- a/package/system/fstools/files/snapshot
+++ b/package/system/fstools/files/snapshot
@@ -6,7 +6,7 @@ do_snapshot_unpack() {
        echo "- snapshot -"
        mkdir /tmp/snapshot
        cd /tmp/snapshot
-       fs-state snapshot read
+       snapshot_tool read
        block=`ls block*.tar.gz 2> /dev/null`
        [ -z "$block" ] || for a in $block; do
                tar xzf $a -C /
@@ -16,7 +16,7 @@ do_snapshot_unpack() {
 
 do_config_unpack() {
        echo "- config -"
-       fs-state snapshot config_read
+       snapshot_tool config_read
        [ -f /tmp/config.tar.gz ] && {
                tar xzf /tmp/config.tar.gz -C /
                rm -f /tmp/config.tar.gz
@@ -24,30 +24,30 @@ do_config_unpack() {
 }
 
 do_snapshot_push() {
-       cd /volatile
+       cd /volatile/upper
        tar czf /tmp/snapshot.tar.gz *
-       fs-state snapshot write
+       snapshot_tool write
        reboot
 }
 
 do_config_push() {
-       cd /volatile
+       cd /volatile/upper
        tar czf /tmp/config.tar.gz *
-       fs-state snapshot config_write
+       snapshot_tool config_write
 }
 
 do_snapshot_upgrade() {
        opkg update
-       [ $? == 0 ] || exit 1
+       [ $? -eq 0 ] || exit 1
 
        opkg list-upgradable
-       [ $? == 0 ] || exit 2
-       
+       [ $? -eq 0 ] || exit 2
+
        UPDATES=`opkg list-upgradable | cut -d" " -f1`
        [ -z "${UPDATES}" ] && exit 0
 
        opkg upgrade ${UPDATES}
-       [ $? == 0 ] || exit 3
+       [ $? -eq 0 ] || exit 3
 
        do_snapshot_push
        sleep 5
@@ -56,7 +56,7 @@ do_snapshot_upgrade() {
 }
 
 do_convert_jffs2() {
-       fs-state snapshot write
+       snapshot_tool write
        sleep 2
        reboot -f
 }
@@ -64,14 +64,16 @@ do_convert_jffs2() {
 do_convert() {
        . /lib/functions.sh
        . /lib/upgrade/common.sh
-       ubus call system upgrade
-       touch /tmp/sysupgrade
-       cd /overlay
+
+       cd /overlay/upper
        tar czf /tmp/snapshot.tar.gz *
-       kill_remaining TERM
-       sleep 3
-       kill_remaining KILL
-       run_ramfs '. /sbin/snapshot; do_convert_jffs2'
+
+       install_bin /sbin/upgraded
+       ubus call system sysupgrade "{
+               \"prefix\": \"$RAM_ROOT\",
+               \"path\": \"\",
+               \"command\": \". /sbin/snapshot; do_convert_jffs2\"
+       }"
 }
 
 [ -n "$(cat /proc/mounts|grep /overlay|grep jffs2)" ] && {
@@ -82,7 +84,7 @@ convert)
 esac
 }
 
-[ -d /volatile ] && {
+[ -d /volatile/upper ] && {
 case $1 in
 push)
        do_snapshot_push
@@ -94,7 +96,7 @@ upgrade)
        do_snapshot_upgrade
        ;;
 info)
-       fs-state info
+       snapshot_tool info
        ;;
 esac
 }