Skip to content

Commit 23ed83e

Browse files
committed
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
1 parent 640a25f commit 23ed83e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

functions/conffile.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ Get_conffiles ()
2121
then
2222
FILES="${LB_CONFIG}"
2323
else
24+
# List standard files first, then possible user arch/dist overrides
25+
FILES="${@}"
2426
local FILE
2527
for FILE in "${@}"; do
26-
FILES="${FILES} ${FILE}"
2728
FILES="${FILES} ${LB_ARCHITECTURE:+$FILE.$LB_ARCHITECTURE}"
2829
FILES="${FILES} ${LB_DISTRIBUTION:+$FILE.$LB_DISTRIBUTION}"
2930
done

0 commit comments

Comments
 (0)