From 1f20b4ded9e18257de787c71b28e147f592c09be Mon Sep 17 00:00:00 2001 From: David Huff Date: Tue, 22 Jul 2008 17:36:06 -0400 Subject: [PATCH] Switch internal code to use new api --- imgcreate/creator.py | 11 +++++------ imgcreate/live.py | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/imgcreate/creator.py b/imgcreate/creator.py index e61f034..64898c5 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -903,12 +903,11 @@ class LoopImageCreator(ImageCreator): self.__base_on(base_on) shutil.copyfile(base_on, self._image) - self.__instloop = SparseExtLoopbackMount(self._image, - self._instroot, - self.__image_size, - self.__fstype, - self.__blocksize, - self.fslabel) + self.__instloop = ExtDiskMount(SparseLoopbackDisk(self._image, self.__image_size), + self._instroot, + self.__fstype, + self.__blocksize, + self.fslabel) try: self.__instloop.mount() diff --git a/imgcreate/live.py b/imgcreate/live.py index e0bac09..abea730 100644 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -131,7 +131,7 @@ class LiveImageCreatorBase(LoopImageCreator): # def __base_on(self, base_on): """helper function to extract ext3 file system from a live CD ISO""" - isoloop = LoopbackMount(base_on, self._mkdtemp()) + isoloop = Mount(LoopbackDisk(base_on), self._mkdtemp()) try: isoloop.mount() @@ -145,10 +145,10 @@ class LiveImageCreatorBase(LoopImageCreator): else: squashimg = isoloop.mountdir + "/LiveOS/squashfs.img" - squashloop = LoopbackMount(squashimg, self._mkdtemp(), "squashfs") + squashloop = Mount(LoopbackDisk(squashimg), self._mkdtemp(), "squashfs") try: - if not os.path.exists(squashloop.lofile): + if not squashloop.disk.exists(): raise CreatorError("'%s' is not a valid live CD ISO : " "squashfs.img doesn't exist" % base_on) -- 2.11.4.GIT