From daa25fded8d6e19ed6794881151f5901705bf975 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Mon, 11 Mar 2024 21:52:39 +0100 Subject: [PATCH] Consolidate sysupgrade.conf entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most of the entries in /etc/sysupgrade.conf are generated by a uci-defaults script in the fff-sysupgrade package. The only entry added in a different place is rc.local.fff_userconfig. Consolidate all entries to be added by the uci-defaults script in fff-sysupgrade. Signed-off-by: Fabian Bläse --- src/packages/fff/fff-support/files/etc/init.d/fff-userconfig | 2 -- .../fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/packages/fff/fff-support/files/etc/init.d/fff-userconfig b/src/packages/fff/fff-support/files/etc/init.d/fff-userconfig index 3c3de120..89a857d5 100755 --- a/src/packages/fff/fff-support/files/etc/init.d/fff-userconfig +++ b/src/packages/fff/fff-support/files/etc/init.d/fff-userconfig @@ -4,8 +4,6 @@ START=96 boot() { LOCALCONFIGSCRIPT="/etc/rc.local.fff_userconfig" - #add LOCALCONFIGSCRIPT to sysupgrade regardless if it already exists or not to prevent data loss - grep -q ^"${LOCALCONFIGSCRIPT}"$ /etc/sysupgrade.conf || echo "$LOCALCONFIGSCRIPT" >> /etc/sysupgrade.conf # process user commands [ -f "${LOCALCONFIGSCRIPT}" ] && { diff --git a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade index 3de48e05..02215ac5 100644 --- a/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade +++ b/src/packages/fff/fff-sysupgrade/files/etc/uci-defaults/99-fff-sysupgrade @@ -13,6 +13,7 @@ cat > /etc/sysupgrade.conf <<-__EOF__ /etc/config/gateway /etc/hoodfile /etc/nftables-fff.conf +/etc/rc.local.fff_userconfig __EOF__ exit 0