ASR_BASE
Change-Id: Icf3719cc0afe3eeb3edc7fa80a2eb5199ca9dda1
diff --git a/package/system/fstools/files/blockd.init b/package/system/fstools/files/blockd.init
new file mode 100755
index 0000000..bdd8bbf
--- /dev/null
+++ b/package/system/fstools/files/blockd.init
@@ -0,0 +1,22 @@
+#!/bin/sh /etc/rc.common
+
+START=80
+
+USE_PROCD=1
+PROG=/sbin/blockd
+
+service_triggers() {
+ procd_add_reload_trigger "fstab"
+}
+
+reload_service() {
+ block autofs start
+}
+
+start_service() {
+ procd_open_instance
+ procd_set_param command "$PROG"
+ procd_set_param watch block
+ procd_set_param respawn
+ procd_close_instance
+}
diff --git a/package/system/fstools/files/fstab.default b/package/system/fstools/files/fstab.default
new file mode 100644
index 0000000..2331e0c
--- /dev/null
+++ b/package/system/fstools/files/fstab.default
@@ -0,0 +1,2 @@
+[ ! -f /etc/config/fstab ] && ( block detect > /etc/config/fstab )
+exit 0
diff --git a/package/system/fstools/files/fstab.init b/package/system/fstools/files/fstab.init
new file mode 100644
index 0000000..03a3993
--- /dev/null
+++ b/package/system/fstools/files/fstab.init
@@ -0,0 +1,22 @@
+#!/bin/sh /etc/rc.common
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2013-2020 OpenWrt.org
+
+START=11
+
+boot() {
+ /sbin/block mount
+}
+
+start() {
+ return 0
+}
+
+restart() {
+ return 0
+}
+
+stop() {
+ /sbin/block umount
+}
diff --git a/package/system/fstools/files/media-change.hotplug b/package/system/fstools/files/media-change.hotplug
new file mode 100644
index 0000000..30fc3d5
--- /dev/null
+++ b/package/system/fstools/files/media-change.hotplug
@@ -0,0 +1,8 @@
+[ -n "$DISK_MEDIA_CHANGE" ] && /sbin/block info
+
+if [ "$ACTION" = "add" -a "$DEVTYPE" = "disk" ]; then
+ case "$DEVNAME" in
+ mtd*) : ;;
+ *) echo 2000 > /sys/block/$DEVNAME/events_poll_msecs ;;
+ esac
+fi
diff --git a/package/system/fstools/files/mount.hotplug b/package/system/fstools/files/mount.hotplug
new file mode 100644
index 0000000..c0efb52
--- /dev/null
+++ b/package/system/fstools/files/mount.hotplug
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+WEBDAV_SD=/www/webdav/sdcard
+if [ -f /tmp/sdcard_mount ]; then
+ [ "$ACTION" = "add" -o "$ACTION" = "remove" ] && /sbin/block hotplug
+
+ if [ "$ACTION" = "add" ]; then
+ echo "$DEVNAME" | grep -q "^mmcblk\|^sd" && {
+ /sbin/block detect > /etc/config/fstab
+ . /sbin/mrvl_detect_sdcard
+ mkdir -p $WEBDAV_SD
+ mount --bind /sdcard $WEBDAV_SD
+ }
+ elif [ "$ACTION" = "remove" ]; then
+ echo "$DEVNAME" | grep -q "^mmcblk\|^sd" && {
+ . /sbin/mrvl_detect_sdcard
+ umount $WEBDAV_SD 2>/dev/null
+ rm $WEBDAV_SD/
+ }
+ fi
+else
+ ( uci show fstab | grep -q @mount ) && {
+ uci delete fstab.@mount[0]
+ uci commit fstab
+ }
+fi
+
diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot
new file mode 100644
index 0000000..a495e34
--- /dev/null
+++ b/package/system/fstools/files/snapshot
@@ -0,0 +1,113 @@
+#!/bin/sh
+# Copyright (C) 2014 OpenWrt.org
+
+
+do_snapshot_unpack() {
+ echo "- snapshot -"
+ mkdir /tmp/snapshot
+ cd /tmp/snapshot
+ snapshot_tool read
+ block=`ls block*.tar.gz 2> /dev/null`
+ [ -z "$block" ] || for a in $block; do
+ tar xzf $a -C /
+ rm -f $a
+ done
+}
+
+do_config_unpack() {
+ echo "- config -"
+ snapshot_tool config_read
+ [ -f /tmp/config.tar.gz ] && {
+ tar xzf /tmp/config.tar.gz -C /
+ rm -f /tmp/config.tar.gz
+ }
+}
+
+do_snapshot_push() {
+ cd /volatile/upper
+ tar czf /tmp/snapshot.tar.gz *
+ snapshot_tool write
+ reboot
+}
+
+do_config_push() {
+ cd /volatile/upper
+ tar czf /tmp/config.tar.gz *
+ snapshot_tool config_write
+}
+
+do_snapshot_upgrade() {
+ opkg update
+ [ $? -eq 0 ] || exit 1
+
+ opkg list-upgradable
+ [ $? -eq 0 ] || exit 2
+
+ UPDATES=`opkg list-upgradable | cut -d" " -f1`
+ [ -z "${UPDATES}" ] && exit 0
+
+ opkg upgrade ${UPDATES}
+ [ $? -eq 0 ] || exit 3
+
+ do_snapshot_push
+ sleep 5
+ reboot
+ sleep 10
+}
+
+do_convert_jffs2() {
+ snapshot_tool write
+ sleep 2
+ reboot -f
+}
+
+do_convert() {
+ . /lib/functions.sh
+ . /lib/upgrade/common.sh
+
+ cd /overlay/upper
+ tar czf /tmp/snapshot.tar.gz *
+
+ 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)" ] && {
+case $1 in
+convert)
+ do_convert
+ ;;
+esac
+}
+
+[ -d /volatile/upper ] && {
+case $1 in
+push)
+ do_snapshot_push
+ ;;
+config)
+ do_config_push
+ ;;
+upgrade)
+ do_snapshot_upgrade
+ ;;
+info)
+ snapshot_tool info
+ ;;
+esac
+}
+
+[ "$SNAPSHOT" = "magic" ] && {
+case $1 in
+unpack)
+ do_snapshot_unpack
+ ;;
+config_unpack)
+ do_config_unpack
+ ;;
+esac
+}