imgcreate/fs.py | 8 +++++++- imgcreate/live.py | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-)
New commits: commit 149e1d01eef4da1064038792e46c8765d8bb0080 Author: Jeremy Katz <ka...@redhat.com> Date: Mon Apr 27 15:31:15 2009 -0400 More ppc syntax fixing (#497193) diff --git a/imgcreate/live.py b/imgcreate/live.py index 4b5286e..f91a5d2 100644 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -670,7 +670,7 @@ image=/ppc/ppc%(bit)s/vmlinuz """ % args - def __write_yaboot_config(isodir, bit): + def __write_yaboot_config(self, isodir, bit): cfg = self.__get_basic_yaboot_config(name = self.name, timeout = self._timeout * 100) commit d218b52f16389d510c74f989e24f471f1ab56075 Author: Jeremy Katz <ka...@redhat.com> Date: Thu Apr 23 12:51:54 2009 -0400 Raise an error if the fsck finds problems diff --git a/imgcreate/fs.py b/imgcreate/fs.py index 5dfacec..65f16e4 100644 --- a/imgcreate/fs.py +++ b/imgcreate/fs.py @@ -457,7 +457,8 @@ class ExtDiskMount(DiskMount): else: bot = t - self.__fsck() + if self.__fsck() != 0: + raise CreatorError("fsck returned an error!") return top def resparse(self, size = None): commit 3141a0ca6d0588605619aded646e638305691226 Author: Jeremy Katz <ka...@redhat.com> Date: Thu Apr 23 12:36:58 2009 -0400 Fix up ppc live image creation (#497193) diff --git a/imgcreate/live.py b/imgcreate/live.py index 7b07d22..4b5286e 100644 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -733,9 +733,9 @@ image=/ppc/ppc32/vmlinuz """configure the boot loader""" havekernel = { 32: False, 64: False } - self.__copy_boot_file("mapping", isodir + "/ppc") - self.__copy_boot_file("bootinfo.txt", isodir + "/ppc") - self.__copy_boot_file("ofboot.b", isodir + "/ppc/mac") + self.__copy_boot_file(isodir + "/ppc", "mapping") + self.__copy_boot_file(isodir + "/ppc", "bootinfo.txt") + self.__copy_boot_file(isodir + "/ppc/mac", "ofboot.b") shutil.copyfile(self._instroot + "/usr/lib/yaboot/yaboot", isodir + "/ppc/mac/yaboot") commit 786dbdd9edf41866544f6810353ed6c5208d618d Author: Jeremy Katz <ka...@redhat.com> Date: Thu Apr 23 12:36:44 2009 -0400 Return return code from fsck in case we want to do something with it diff --git a/imgcreate/fs.py b/imgcreate/fs.py index cc4d503..5dfacec 100644 --- a/imgcreate/fs.py +++ b/imgcreate/fs.py @@ -419,7 +419,8 @@ class ExtDiskMount(DiskMount): def __fsck(self): logging.debug("Checking filesystem %s" % self.disk.lofile) - subprocess.call(["/sbin/e2fsck", "-f", "-y", self.disk.lofile]) + rc = subprocess.call(["/sbin/e2fsck", "-f", "-y", self.disk.lofile]) + return rc def __get_size_from_filesystem(self): def parse_field(output, field): commit f2719f41b9e6be0b15b533d166620a31d0730d16 Author: Jeremy Katz <ka...@redhat.com> Date: Thu Apr 23 12:33:45 2009 -0400 Fsck after resize to catch/fix problems (#497377) diff --git a/imgcreate/fs.py b/imgcreate/fs.py index 4a698e8..cc4d503 100644 --- a/imgcreate/fs.py +++ b/imgcreate/fs.py @@ -397,6 +397,8 @@ class ExtDiskMount(DiskMount): self.__fsck() resize2fs(self.disk.lofile, size) + + self.__fsck() return size def __create(self): @@ -453,6 +455,8 @@ class ExtDiskMount(DiskMount): top = t else: bot = t + + self.__fsck() return top def resparse(self, size = None): -- Fedora-livecd-list mailing list Fedora-livecd-list@redhat.com https://www.redhat.com/mailman/listinfo/fedora-livecd-list