diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-28 12:34:33 +0100 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-30 19:37:51 +0100 |
| commit | 72321c2b9be15c68567efbfaca5ee24590a3a80a (patch) | |
| tree | 5387fc740a5609e6dd4f6ed361cd1c7fbe853c03 | |
| parent | b4156e146f83474a9cb1aca9117a4a4053c62683 (diff) | |
| download | vyos-live-build-72321c2b9be15c68567efbfaca5ee24590a3a80a.tar.gz vyos-live-build-72321c2b9be15c68567efbfaca5ee24590a3a80a.zip | |
config: optimise --ignore-system-defaults
Gbp-Dch: Ignore
| -rwxr-xr-x | scripts/build/config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/config b/scripts/build/config index a3d36d9df..b511d79ae 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -245,6 +245,7 @@ Local_arguments () ;; --ignore-system-defaults) + _IGNORE_SYSTEM_DEFAULTS="true" shift ;; @@ -928,8 +929,7 @@ fi # Reading config defaults configured at system level if ls /etc/live/build.conf > /dev/null 2>&1 || ls /etc/live/build/* > /dev/null 2>&1 then - if In_list "--ignore-system-defaults" "${@}" - then + if [ "${_IGNORE_SYSTEM_DEFAULTS}" = "true" ]; then Echo_message "Ignoring defaults in %s" "/etc/live/build.conf" else Echo_message "Using defaults in %s" "/etc/live/build.conf" |