From efd36a0333a5bc66a42f94ecd2b443009fa33c61 Mon Sep 17 00:00:00 2001 From: gl-dengxinfa Date: Mon, 7 Nov 2022 10:33:53 +0800 Subject: [PATCH] ramips: delete patch that do not keep config --- .../0005-fix-do-not-keep-config.patch | 24 ------------------- .../0005-fix-do-not-keep-config.patch | 24 ------------------- profiles/glinet_mt1300.yml | 3 ++- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 patches-22.03.0/0005-fix-do-not-keep-config.patch delete mode 100644 patches-22.03.2/0005-fix-do-not-keep-config.patch diff --git a/patches-22.03.0/0005-fix-do-not-keep-config.patch b/patches-22.03.0/0005-fix-do-not-keep-config.patch deleted file mode 100644 index 1644c0a..0000000 --- a/patches-22.03.0/0005-fix-do-not-keep-config.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cc3433812dc4132876ae4edd930bec97bd6308c Mon Sep 17 00:00:00 2001 -From: gl-dengxinfa -Date: Wed, 28 Sep 2022 17:13:22 +0800 -Subject: [PATCH] fix: do not keep config - ---- - package/base-files/files/lib/preinit/80_mount_root | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root -index c3816c2cbf..62a1a4bf32 100644 ---- a/package/base-files/files/lib/preinit/80_mount_root -+++ b/package/base-files/files/lib/preinit/80_mount_root -@@ -17,6 +17,7 @@ missing_lines() { - do_mount_root() { - mount_root - boot_run_hook preinit_mount_root -+ return - [ -f /sysupgrade.tgz -o -f /tmp/sysupgrade.tar ] && { - echo "- config restore -" - cp /etc/passwd /etc/group /etc/shadow /tmp --- -2.34.1 - diff --git a/patches-22.03.2/0005-fix-do-not-keep-config.patch b/patches-22.03.2/0005-fix-do-not-keep-config.patch deleted file mode 100644 index 1644c0a..0000000 --- a/patches-22.03.2/0005-fix-do-not-keep-config.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0cc3433812dc4132876ae4edd930bec97bd6308c Mon Sep 17 00:00:00 2001 -From: gl-dengxinfa -Date: Wed, 28 Sep 2022 17:13:22 +0800 -Subject: [PATCH] fix: do not keep config - ---- - package/base-files/files/lib/preinit/80_mount_root | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root -index c3816c2cbf..62a1a4bf32 100644 ---- a/package/base-files/files/lib/preinit/80_mount_root -+++ b/package/base-files/files/lib/preinit/80_mount_root -@@ -17,6 +17,7 @@ missing_lines() { - do_mount_root() { - mount_root - boot_run_hook preinit_mount_root -+ return - [ -f /sysupgrade.tgz -o -f /tmp/sysupgrade.tar ] && { - echo "- config restore -" - cp /etc/passwd /etc/group /etc/shadow /tmp --- -2.34.1 - diff --git a/profiles/glinet_mt1300.yml b/profiles/glinet_mt1300.yml index ef6ae27..ea1bd1f 100644 --- a/profiles/glinet_mt1300.yml +++ b/profiles/glinet_mt1300.yml @@ -6,7 +6,7 @@ feeds: branch: v4.1.0_mt1300 - name: gl_feed_common uri: https://github.com/gl-inet/gl-feeds.git - revision: 886a4930f6738fca88a23d2042234cebe5ce028d + revision: 3736d7437fb9a57014bb779d495aa11700462959 packages: - kmod-ipt-offload @@ -77,6 +77,7 @@ packages: - gl-sdk4-timer - gl-sdk4-tor - gl-sdk4-igmp + - gl-sdk4-keepcfg - gl-sdk4-ui-adminpw - gl-sdk4-ui-advanced - gl-sdk4-ui-bridge