Commit c80f2d67 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

.factorydefault should be placed into /dev/disk/by-label/data regardless of...

.factorydefault should be placed into /dev/disk/by-label/data regardless of currently mounted file system on /data
parent 149ad92e
diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh
--- easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh 2019-12-17 21:33:19.000000000 +1030 --- easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh 2019-12-17 21:33:19.000000000 +1030
+++ easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh 2021-06-20 12:38:28.222312349 +0930 +++ easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh 2021-10-25 01:08:00.047493149 +1030
@@ -399,11 +399,7 @@ @@ -399,11 +399,11 @@
return return
fi fi
if [ "$action" = "factory_reset" ]; then if [ "$action" = "factory_reset" ]; then
...@@ -10,13 +10,17 @@ diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh easycwmp-1.8.6-blank_de ...@@ -10,13 +10,17 @@ diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh easycwmp-1.8.6-blank_de
- else - else
- /sbin/jffs2mark -y - /sbin/jffs2mark -y
- fi - fi
+ touch /data/.factorydefault + mkdir -p /run/data
+ mount /dev/disk/by-label/data /run/data
+ touch /run/data/.factorydefault
+ umount /run/data
+ rmdir /run/data
sync sync
reboot reboot
fi fi
diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh.orig easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh.orig diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh.orig easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh.orig
--- easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh.orig 1970-01-01 09:30:00.000000000 +0930 --- easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh.orig 1970-01-01 09:30:00.000000000 +0930
+++ easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh.orig 2021-06-20 12:38:28.223312352 +0930 +++ easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh.orig 2021-10-25 01:06:20.959184636 +1030
@@ -0,0 +1,540 @@ @@ -0,0 +1,540 @@
+#!/bin/sh +#!/bin/sh
+# Copyright (C) 2012-2014 PIVA Software <www.pivasoftware.com> +# Copyright (C) 2012-2014 PIVA Software <www.pivasoftware.com>
...@@ -560,7 +564,7 @@ diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh.orig easycwmp-1.8.6-bla ...@@ -560,7 +564,7 @@ diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh.orig easycwmp-1.8.6-bla
+handle_action 2>/dev/null +handle_action 2>/dev/null
diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/functions/common/device_info easycwmp-1.8.6-blank_device/ext/openwrt/scripts/functions/common/device_info diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/functions/common/device_info easycwmp-1.8.6-blank_device/ext/openwrt/scripts/functions/common/device_info
--- easycwmp-1.8.6/ext/openwrt/scripts/functions/common/device_info 2019-12-17 21:33:19.000000000 +1030 --- easycwmp-1.8.6/ext/openwrt/scripts/functions/common/device_info 2019-12-17 21:33:19.000000000 +1030
+++ easycwmp-1.8.6-blank_device/ext/openwrt/scripts/functions/common/device_info 2021-06-20 12:38:28.223312352 +0930 +++ easycwmp-1.8.6-blank_device/ext/openwrt/scripts/functions/common/device_info 2021-10-25 01:06:20.959184636 +1030
@@ -25,11 +25,12 @@ @@ -25,11 +25,12 @@
common_execute_method_param "$DMROOT.DeviceInfo.SerialNumber" "0" "$UCI_GET easycwmp.@device[0].serial_number" "" "" "1" common_execute_method_param "$DMROOT.DeviceInfo.SerialNumber" "0" "$UCI_GET easycwmp.@device[0].serial_number" "" "" "1"
common_execute_method_param "$DMROOT.DeviceInfo.HardwareVersion" "0" "$UCI_GET easycwmp.@device[0].hardware_version" "" "" "1" common_execute_method_param "$DMROOT.DeviceInfo.HardwareVersion" "0" "$UCI_GET easycwmp.@device[0].hardware_version" "" "" "1"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment