summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-02-17 15:36:56 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-03-04 13:17:06 +0000
commite8b7abe65fcab62ecb84b7f0c2c6f9dde4e63ea7 (patch)
tree9351a4c77ab886732d04361f7d1139d6c750318e
parent539eed7e4045ef39377f4c7fe6cc9314799b9f4d (diff)
downloaddefinitions-e8b7abe65fcab62ecb84b7f0c2c6f9dde4e63ea7.tar.gz
Make parse_autostart() into more general get_environment_boolean()
Also, be more flexible when parsing environment booleans -- convert to lower case and match 0/1 and true/false as well as yes/no.
-rwxr-xr-xkvm.write4
-rwxr-xr-xrawdisk.write2
-rwxr-xr-xvirtualbox-ssh.write2
3 files changed, 4 insertions, 4 deletions
diff --git a/kvm.write b/kvm.write
index 4f877c22..94560972 100755
--- a/kvm.write
+++ b/kvm.write
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@ class KvmPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
temp_root, location = args
ssh_host, vm_name, vm_path = self.parse_location(location)
- autostart = self.parse_autostart()
+ autostart = self.get_environment_boolean('AUTOSTART')
fd, raw_disk = tempfile.mkstemp()
os.close(fd)
diff --git a/rawdisk.write b/rawdisk.write
index 1b4d58c0..bde9d67d 100755
--- a/rawdisk.write
+++ b/rawdisk.write
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 Codethink Limited
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/virtualbox-ssh.write b/virtualbox-ssh.write
index 204b2447..2a2f3f7b 100755
--- a/virtualbox-ssh.write
+++ b/virtualbox-ssh.write
@@ -62,7 +62,7 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension):
temp_root, location = args
ssh_host, vm_name, vdi_path = self.parse_location(location)
- autostart = self.parse_autostart()
+ autostart = self.get_environment_boolean('AUTOSTART')
fd, raw_disk = tempfile.mkstemp()
os.close(fd)