summaryrefslogtreecommitdiff
path: root/bin
diff options
authorJeff Lane <jeffrey.lane@canonical.com>2016-05-18 15:02:12 -0400
committerJeff Lane <jeffrey.lane@canonical.com>2016-05-18 15:02:12 -0400
commita7100074ed36ff3939dcc75dfee7e10d758722cb (patch)
tree042e73f312b860d94b58be2a9a69891e02ca205b /bin
parentc3e8e9f47902156d490b57aef53749beee538b6b (diff)
p-p-c:bin/virtualization - Changded DEFAULT_CFG to proper config dir since we no longer create checkbox.d. Modified No Config File warning to be more informative and less confusing to external testers
Diffstat (limited to 'bin')
-rwxr-xr-xbin/virtualization5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/virtualization b/bin/virtualization
index 9879ec6..56fc52a 100755
--- a/bin/virtualization
+++ b/bin/virtualization
@@ -410,7 +410,7 @@ final_message: CERTIFICATION BOOT COMPLETE
def test_kvm(args):
print("Executing KVM Test", file=sys.stderr)
- DEFAULT_CFG = "/etc/checkbox.d/virtualization.cfg"
+ DEFAULT_CFG = "/etc/xdg/virtualization.cfg"
image = ""
timeout = ""
@@ -422,7 +422,8 @@ def test_kvm(args):
try:
config.readfp(open(config_file))
except IOError:
- logging.warn("No config file found")
+ logging.warn("Config file %s was not found" % DEFAULT_CFG)
+ logging.warn("Now looking for ENV variables and command line arguments instead")
else:
try:
timeout = config.getfloat("KVM", "timeout")