diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-28 18:41:44 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-05-01 08:57:44 +0000 |
| commit | a72e7daaf74fbc4a67d251e5e8f9d5bfb596ba97 (patch) | |
| tree | e354caaf3e67ad8a5fadc7a9b07f689d4d408184 /functions | |
| parent | 61aa3239c5c93d6d7bdc5b9b6a407f400799779b (diff) | |
| download | vyos-live-build-a72e7daaf74fbc4a67d251e5e8f9d5bfb596ba97.tar.gz vyos-live-build-a72e7daaf74fbc4a67d251e5e8f9d5bfb596ba97.zip | |
config: only try to load FILE.ARCH and FILE.DIST if non-empty strings
to thus avoid trying to load `FILE.`
Gbp-Dch: Ignore
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/conffile.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/functions/conffile.sh b/functions/conffile.sh index d1036adcf..c57f4ed53 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -18,7 +18,9 @@ Get_conffiles () else local FILE for FILE in "${@}"; do - FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURE} ${FILE}.${DISTRIBUTION}" + FILES="${FILES} ${FILE}" + FILES="${FILES} ${LB_ARCHITECTURE:+$FILE.$LB_ARCHITECTURE}" + FILES="${FILES} ${DISTRIBUTION:+$FILE.$DISTRIBUTION}" done fi |