fstools: fix snapshot support

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

diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot
index 1450e12458a54dd7e27d6199b0744f1f430748d6..c1a5b733f3c70e2bb5f2e83d3589e2f10832760f 100644 (file)
--- a/package/system/fstools/files/snapshot
+++ b/package/system/fstools/files/snapshot
@@ -24,30 +24,30 @@ do_config_unpack() {
 }
 
 do_snapshot_push() {
-       cd /volatile
+       cd /volatile/upper
        tar czf /tmp/snapshot.tar.gz *
        snapshot_tool write
        reboot
 }
 
 do_config_push() {
-       cd /volatile
+       cd /volatile/upper
        tar czf /tmp/config.tar.gz *
        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
@@ -66,7 +66,7 @@ do_convert() {
        . /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
@@ -82,7 +82,7 @@ convert)
 esac
 }
 
-[ -d /volatile ] && {
+[ -d /volatile/upper ] && {
 case $1 in
 push)
        do_snapshot_push