imgcreate/fs.py | 7 +++++-- imgcreate/live.py | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-)
New commits: commit 1d215ebcf584b2bc19dece88b7f75944de2ad3f0 Author: Jeremy Katz <[email protected]> Date: Wed Aug 19 16:47:24 2009 -0400 Use resize2fs -M (minimal) more We were keeping track of the minimal size and then passing that again. Just use resize2fs -M again for this case diff --git a/imgcreate/fs.py b/imgcreate/fs.py index 31e5ca3..b8d61db 100644 --- a/imgcreate/fs.py +++ b/imgcreate/fs.py @@ -553,7 +553,7 @@ class DeviceMapperSnapshot(object): except ValueError: raise SnapshotError("Failed to parse dmsetup status: " + out) -def create_image_minimizer(path, image, minimal_size): +def create_image_minimizer(path, image, target_size = None): """ Builds a copy-on-write image which can be used to create a device-mapper snapshot of an image where @@ -580,7 +580,10 @@ def create_image_minimizer(path, image, minimal_size): try: snapshot.create() - resize2fs(snapshot.path, minimal_size) + if target_size is not None: + resize2fs(snapshot.path, target_size) + else: + resize2fs(snapshot.path, minimal = True) cow_used = snapshot.get_cow_used() finally: diff --git a/imgcreate/live.py b/imgcreate/live.py index 756097b..528840d 100644 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -271,11 +271,10 @@ class LiveImageCreatorBase(LoopImageCreator): try: makedirs(self.__ensure_isodir() + "/LiveOS") - minimal_size = self._resparse() + self._resparse() if not self.skip_minimize: - create_image_minimizer(self.__isodir + "/LiveOS/osmin.img", - self._image, minimal_size) + create_image_minimizer(self.__isodir + "/LiveOS/osmin.img", self._image) if self.skip_compression: shutil.move(self._image, self.__isodir + "/LiveOS/ext3fs.img") -- Fedora-livecd-list mailing list [email protected] https://www.redhat.com/mailman/listinfo/fedora-livecd-list
