From bf304d10e97c11de8c637fda02578cce79a3a0b4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
Date: Wed, 14 Feb 2024 16:05:19 +0100
Subject: [PATCH] base-files: sysupgrade: include uci-defaults script disabling
 services
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Disabled services should be kept disabled after sysupgrade. This can be
easily handled using a proper uci-defaults script.

Extend sysupgrade to check for disabled services, generate uci-defaults
script disabling them and include it in backup.

Cc: Christian Marangi <ansuelsmth@gmail.com>
Cc: Jo-Philipp Wich <jo@mein.io>
Cc: Jonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Acked-by: Jo-Philipp Wich <jo@mein.io>
---
 package/base-files/files/sbin/sysupgrade | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 66bdf95de0..4bac1041d9 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -260,6 +260,16 @@ do_save_conffiles() {
 			\) | sed -e 's,.*/,,;s/\.control /\t/' > "$dir/${INSTALLED_PACKAGES}"
 	fi
 
+	mkdir -p $dir/etc/uci-defaults/
+	touch $dir/etc/uci-defaults/10_disable_services
+	for service in /etc/init.d/*; do
+		if ! $service enabled; then
+			echo "$service disable" >> $dir/etc/uci-defaults/10_disable_services
+		fi
+	done
+	echo "exit 0" >> $dir/etc/uci-defaults/10_disable_services
+	echo "/etc/uci-defaults/10_disable_services" >> "$CONFFILES"
+
 	v "Saving config files..."
 	[ "$VERBOSE" -gt 1 ] && TAR_V="v" || TAR_V=""
 	sed -i -e 's,^/,,' "$CONFFILES"
-- 
2.30.2