From e864536a8626fff2484f569f00e67c293b6a3b6c Mon Sep 17 00:00:00 2001 From: Daniel Manrique Date: Fri, 11 Apr 2014 17:47:45 -0400 Subject: Reverted commit 2920 - see https://code.launchpad.net/~bladernr/checkbox/1306795/+merge/215501 for rationale --- bin/network | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/network b/bin/network index 5d45a8d..6ab5b16 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/xdg/canonical-certification.conf" + DEFAULT_CFG = "/etc/checkbox.d/network.cfg" if not "config" in vars(args): config_filename = DEFAULT_CFG else: @@ -449,8 +449,7 @@ 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("No target address found. Please check config file: %s" % - config_filename) + logging.error("Please supply target via: %s", config_filename) sys.exit(1) # Testing begins here! -- cgit v1.2.3