From 282e8173509a0907ec469d493f3bd9fed710c453 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Fri, 13 Mar 2020 16:05:43 +0100 Subject: base-files: do not source system.sh in functions.sh The default_postinst() function in /lib/functions.sh sources /lib/functions/system.sh before cycling through uci-defaults files. This creates a pseudo-cyclic dependency as system.sh also uses functions that are located in functions.sh. Despite that, there is actually only one uci-defaults file in the entire repo that needs system.sh, and this one contains an explicit source for system.sh anyway. Consequently, this patch removes the sourcing of system.sh in functions.sh. There are no relevant uses in packages, routing and luci repositories. This may require adjustments for downstream, though. Signed-off-by: Adrian Schmutzler --- package/base-files/files/lib/functions.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'package/base-files/files') diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index fe908f7aa4..a77b669709 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -254,7 +254,6 @@ default_postinst() { fi if grep -m1 -q -s "^/etc/uci-defaults/" "$filelist"; then - . /lib/functions/system.sh [ -d /tmp/.uci ] || mkdir -p /tmp/.uci for i in $(grep -s "^/etc/uci-defaults/" "$filelist"); do ( [ -f "$i" ] && cd "$(dirname $i)" && . "$i" ) && rm -f "$i" -- cgit v1.2.3