mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-17 17:31:27 +00:00
82 lines
2.5 KiB
Diff
82 lines
2.5 KiB
Diff
From 1f9978564420818d4ce4bdbb08fce2eca7c13d8e Mon Sep 17 00:00:00 2001
|
|
From: Rick Sommerville <rick.sommerville@netexperience.com>
|
|
Date: Sun, 23 May 2021 14:36:03 -0400
|
|
Subject: [PATCH] Preserve certificates and redirector over factory-reset
|
|
|
|
---
|
|
package/base-files/files/etc/rc.button/reset | 2 +-
|
|
.../patches/001-jffs2reset-keep-option | 48 +++++++++++++++++++
|
|
2 files changed, 49 insertions(+), 1 deletion(-)
|
|
create mode 100644 package/system/fstools/patches/001-jffs2reset-keep-option
|
|
|
|
diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
|
|
index 2403122ad2..56c0548ec9 100755
|
|
--- a/package/base-files/files/etc/rc.button/reset
|
|
+++ b/package/base-files/files/etc/rc.button/reset
|
|
@@ -23,7 +23,7 @@ released)
|
|
elif [ "$SEEN" -ge 5 -a -n "$OVERLAY" ]
|
|
then
|
|
echo "FACTORY RESET" > /dev/console
|
|
- jffs2reset -y && reboot &
|
|
+ wlan_ap_factory_reset.sh
|
|
fi
|
|
;;
|
|
esac
|
|
diff --git a/package/system/fstools/patches/001-jffs2reset-keep-option b/package/system/fstools/patches/001-jffs2reset-keep-option
|
|
new file mode 100644
|
|
index 0000000000..50209ea276
|
|
--- /dev/null
|
|
+++ b/package/system/fstools/patches/001-jffs2reset-keep-option
|
|
@@ -0,0 +1,48 @@
|
|
+--- a/jffs2reset.c
|
|
++++ b/jffs2reset.c
|
|
+@@ -40,7 +40,7 @@ ask_user(void)
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+-static int jffs2_reset(struct volume *v, int reset)
|
|
++static int jffs2_reset(struct volume *v, int reset, int keep)
|
|
+ {
|
|
+ char *mp;
|
|
+
|
|
+@@ -48,7 +48,7 @@ static int jffs2_reset(struct volume *v,
|
|
+ if (mp) {
|
|
+ ULOG_INFO("%s is mounted as %s, only erasing files\n", v->blk, mp);
|
|
+ fs_state_set("/overlay", FS_STATE_PENDING);
|
|
+- overlay_delete(mp, false);
|
|
++ overlay_delete(mp, keep);
|
|
+ mount(mp, "/", NULL, MS_REMOUNT, 0);
|
|
+ } else {
|
|
+ ULOG_INFO("%s is not mounted\n", v->blk);
|
|
+@@ -93,8 +93,8 @@ static int jffs2_mark(struct volume *v)
|
|
+ int main(int argc, char **argv)
|
|
+ {
|
|
+ struct volume *v;
|
|
+- int ch, yes = 0, reset = 0;
|
|
+- while ((ch = getopt(argc, argv, "yr")) != -1) {
|
|
++ int ch, yes = 0, reset = 0, keep = 0;
|
|
++ while ((ch = getopt(argc, argv, "yrk")) != -1) {
|
|
+ switch(ch) {
|
|
+ case 'y':
|
|
+ yes = 1;
|
|
+@@ -102,6 +102,9 @@ int main(int argc, char **argv)
|
|
+ case 'r':
|
|
+ reset = 1;
|
|
+ break;
|
|
++ case 'k':
|
|
++ keep = 1;
|
|
++ break;
|
|
+ }
|
|
+
|
|
+ }
|
|
+@@ -128,5 +131,5 @@ int main(int argc, char **argv)
|
|
+ volume_init(v);
|
|
+ if (!strcmp(*argv, "jffs2mark"))
|
|
+ return jffs2_mark(v);
|
|
+- return jffs2_reset(v, reset);
|
|
++ return jffs2_reset(v, reset, keep);
|
|
+ }
|
|
--
|
|
2.17.1
|
|
|