summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-07 13:02:03 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-10 10:57:38 +0000
commit5560217b3b331e7e4d9c166cb6eecc7c9415545a (patch)
tree37ccd5f066fdda82b39d7e9a782b4704497e69b4
parentc81057af3c52a760de7cc3079a4fdc8365eeb884 (diff)
downloadmorph-5560217b3b331e7e4d9c166cb6eecc7c9415545a.tar.gz
Move DISK_SIZE detection inside create_raw_disk_image
-rw-r--r--morphlib/writeexts.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py
index ba443aff..32920458 100644
--- a/morphlib/writeexts.py
+++ b/morphlib/writeexts.py
@@ -145,10 +145,7 @@ class WriteExtension(cliapp.Application):
def create_local_system(self, temp_root, raw_disk):
'''Create a raw system image locally.'''
- size = self.get_disk_size()
- if not size:
- raise cliapp.AppException('DISK_SIZE is not defined')
- self.create_raw_disk_image(raw_disk, size)
+ self.create_raw_disk_image(raw_disk)
try:
self.mkfs_btrfs(raw_disk)
mp = self.mount(raw_disk)
@@ -212,9 +209,12 @@ class WriteExtension(cliapp.Application):
'''Parse the virtual cpu count from environment.'''
return self._parse_size_from_environment('VCPUS', '1')
- def create_raw_disk_image(self, filename, size):
+ def create_raw_disk_image(self, filename):
'''Create a raw disk image.'''
+ size = self.get_disk_size()
+ if not size:
+ raise cliapp.AppException('DISK_SIZE is not defined')
self.status(msg='Creating empty disk image')
with open(filename, 'wb') as f:
if size > 0: