From c444ab44e2f2c9ba50a12b3894188b524a2a2c7a Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Wed, 21 Jun 2017 17:08:20 -0500
Subject: 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
---
 network/scripts/run-os-net-config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'network/scripts')

diff --git a/network/scripts/run-os-net-config.sh b/network/scripts/run-os-net-config.sh
index 8fe2d270..864da24b 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
 
-- 
cgit 1.2.3-korg