From: Rafał Miłecki <rafal@milecki.pl>
Date: Thu, 22 Feb 2024 15:40:56 +0000 (+0100)
Subject: Revert "base-files: sysupgrade: include uci-defaults script disabling services"
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=7bffa8ab108f07940ee2c0e5d8573d5c4431e0ed;p=openwrt%2Fstaging%2F981213.git

Revert "base-files: sysupgrade: include uci-defaults script disabling services"

This reverts commit bf304d10e97c11de8c637fda02578cce79a3a0b4.

That uci-defaults script worked great but generating it required
mounting root dir as overlay lowerdir that needs to be reverted.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 4bac1041d9..66bdf95de0 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -260,16 +260,6 @@ 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"