From 23ed83e730396d9af72343e126978418597c7deb Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 2 May 2020 20:44:02 +0100 Subject: [PATCH] config: tweak config file loading order load the base set of files first, then any user arch/dist specific override files second. this is important since whenever config items get moved in the base files, this can break the override files, if an option specified in one was moved to a different common file that it loaded after. Gbp-Dch: Ignore --- functions/conffile.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/functions/conffile.sh b/functions/conffile.sh index 09be0bcc6..dbe912be9 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -21,9 +21,10 @@ Get_conffiles () then FILES="${LB_CONFIG}" else + # List standard files first, then possible user arch/dist overrides + FILES="${@}" local FILE for FILE in "${@}"; do - FILES="${FILES} ${FILE}" FILES="${FILES} ${LB_ARCHITECTURE:+$FILE.$LB_ARCHITECTURE}" FILES="${FILES} ${LB_DISTRIBUTION:+$FILE.$LB_DISTRIBUTION}" done