diff options
author | Your Name <you@example.com> | 2014-11-07 13:02:03 +0000 |
---|---|---|
committer | Your Name <you@example.com> | 2014-11-07 13:02:03 +0000 |
commit | 3eed077ae49dec9719662c9103b490f82ac4fce5 (patch) | |
tree | 66f6113f67c006df17cd55871fe1637cc23470dd | |
parent | e3a8b8de87d1630c378728ac4a2d4fdb5e786ff0 (diff) | |
download | morph-3eed077ae49dec9719662c9103b490f82ac4fce5.tar.gz |
Move DISK_SIZE detection inside create_raw_disk_image
-rw-r--r-- | morphlib/writeexts.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py index 9beb8dd2..a63c260e 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: |