Fix fallback logic in run-os-net-config.sh

The expression "${variable:-''}" with $variable unset results in a
value that looks like "''", which will not pass a -z test, as I
believe is intended in this code.  Making the default value blank
yields the correct behavior.

Change-Id: I9fe98f3c69c797feb9c37da1ad8c7912a15bcecb
Closes-Bug: 1699614
changes/80/476280/1
Ben Nemec 5 years ago
parent 4ccce0e36b
commit c444ab44e2
  1. 2
      network/scripts/run-os-net-config.sh

@ -110,7 +110,7 @@ EOF_CAT
}
if [ -n '$network_config' ]; then
if [ -z "${disable_configure_safe_defaults:-''}" ]; then
if [ -z "${disable_configure_safe_defaults:-}" ]; then
trap configure_safe_defaults EXIT
fi

Loading…
Cancel
Save