summaryrefslogtreecommitdiff
diff options
authorJeff Lane <jeffrey.lane@canonical.com>2014-04-11 17:32:24 -0400
committerDaniel Manrique <>2014-04-11 17:32:24 -0400
commitef2d98db73a2b3f4a12be8499e7edb01e2bd3ce2 (patch)
tree560547fc67c693fdeb980ba72efb5fbed09aafad
parentc3256efae5284c7389023bf60f85e3867bd64d6d (diff)
parente1e2f37481b29276891e552561fab724d5550c70 (diff)
"automatic merge by tarmac [r=zkrynicki][bug=1306795][author=bladernr]"
-rwxr-xr-xbin/network5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/network b/bin/network
index 6ab5b16..5d45a8d 100755
--- a/bin/network
+++ b/bin/network
@@ -429,7 +429,7 @@ def interface_test(args):
# Determine whether to use the default or user-supplied config
# file name.
- DEFAULT_CFG = "/etc/checkbox.d/network.cfg"
+ DEFAULT_CFG = "/etc/xdg/canonical-certification.conf"
if not "config" in vars(args):
config_filename = DEFAULT_CFG
else:
@@ -449,7 +449,8 @@ def interface_test(args):
# Validate that we got reasonable values
if not test_target or "example.com" in test_target:
# Default values found in config file
- logging.error("Please supply target via: %s", config_filename)
+ logging.error("No target address found. Please check config file: %s" %
+ config_filename)
sys.exit(1)
# Testing begins here!