aboutsummaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
authorBen Nemec <bnemec@redhat.com>2017-06-21 17:08:20 -0500
committerBen Nemec <bnemec@redhat.com>2017-06-21 17:08:20 -0500
commitc444ab44e2f2c9ba50a12b3894188b524a2a2c7a (patch)
treed5ba37f400151cc9308a2106f0ef69213f648e9b /network
parent4ccce0e36bae905cf998f4c9a147833f6305142a (diff)
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
Diffstat (limited to 'network')
-rwxr-xr-xnetwork/scripts/run-os-net-config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/network/scripts/run-os-net-config.sh b/network/scripts/run-os-net-config.sh
index 8fe2d27..864da24 100755
--- a/network/scripts/run-os-net-config.sh
+++ b/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