Makefile | 2 +- imgcreate/fs.py | 16 +++++++--------- imgcreate/live.py | 33 +++++++++++++++------------------ 3 files changed, 23 insertions(+), 28 deletions(-)
New commits: commit d457ef30d52d35d7633d887b6103c93f587855e1 Author: Brian C. Lane <[email protected]> Date: Wed Sep 14 10:55:45 2011 -0700 Version 16.6 diff --git a/Makefile b/Makefile index 14ffbd7..b64ecd7 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 16.5 +VERSION = 16.6 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit ba41cae95d4cf0fc5abc439cbc6096819a277fd7 Author: Brian C. Lane <[email protected]> Date: Tue Sep 13 14:55:00 2011 -0700 Stop creating backup image before resizing (#737243) diff --git a/imgcreate/fs.py b/imgcreate/fs.py index d5307a2..a387f51 100644 --- a/imgcreate/fs.py +++ b/imgcreate/fs.py @@ -92,10 +92,8 @@ def resize2fs(fs, size = None, minimal = False, tmpdir = "/tmp"): raise ResizeError("Must specify either a size or minimal for resize!") e2fsck(fs) - (fd, saved_image) = tempfile.mkstemp("", "resize-image-", tmpdir) - os.close(fd) - call(["/sbin/e2image", "-r", fs, saved_image]) + logging.info("resizing %s" % (fs,)) args = ["/sbin/resize2fs", fs] if minimal: args.append("-M") @@ -103,17 +101,17 @@ def resize2fs(fs, size = None, minimal = False, tmpdir = "/tmp"): args.append("%sK" %(size / 1024,)) ret = call(args) if ret != 0: - raise ResizeError("resize2fs returned an error (%d)! image to debug at %s" %(ret, saved_image)) + raise ResizeError("resize2fs returned an error (%d)!" % (ret,)) + + ret = e2fsck(fs) + if ret != 0: + raise ResizeError("fsck after resize returned an error (%d)!", (ret,)) - if e2fsck(fs) != 0: - raise ResizeError("fsck after resize returned an error! image to debug at %s" %(saved_image,)) - os.unlink(saved_image) return 0 def e2fsck(fs): logging.info("Checking filesystem %s" % fs) - rc = call(["/sbin/e2fsck", "-f", "-y", fs]) - return rc + return call(["/sbin/e2fsck", "-f", "-y", fs]) class BindChrootMount: """Represents a bind mount of a directory into a chroot.""" commit 7db0bde27d07905e067723cce21085c7c53cd0f7 Author: Brian C. Lane <[email protected]> Date: Wed Sep 14 10:23:55 2011 -0700 Correct some syslinux typos (#738381) diff --git a/imgcreate/live.py b/imgcreate/live.py index 87151c2..2aa8ab6 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -570,7 +570,7 @@ menu separator long = "Start " + long + " in ^basic graphics mode.", short = "basic" + index, extra = "xdriver=vesa nomodeset", - help = "Try this option out if you're having trouble starting.", + help = "Try this option out if you're having trouble installing " + long + ".", index = index)) if checkisomd5: @@ -600,7 +600,7 @@ menu separator return """label memtest menu label Run a ^memory test. text help - If your system is having issues, an problem with your + If your system is having issues, a problem with your system's memory may be the cause. Use this utility to see if the memory is working correctly. endtext commit a3c11ee33ca60c525d16c35247060730124d2b50 Author: Brian C. Lane <[email protected]> Date: Wed Sep 14 10:02:37 2011 -0700 splash is now png (#738381) Search for the new background image first, falling back to the previous locations if it isn't found. diff --git a/imgcreate/live.py b/imgcreate/live.py index 721b609..87151c2 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -402,21 +402,20 @@ class x86LiveImageCreator(LiveImageCreatorBase): shutil.copy(path, isodir + "/isolinux/") - def __copy_syslinux_background(self, isodest): - background_path = self._instroot + \ - "/usr/share/anaconda/boot/syslinux-vesa-splash.jpg" - - if not os.path.exists(background_path): - # fallback to F13 location - background_path = self._instroot + \ - "/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg" - - if not os.path.exists(background_path): - return False + def __copy_syslinux_background(self, isodir): + """ Find the correct splash image, copy it to the destination and + return the name of the file. + """ + bg_list = [ ("/usr/share/anaconda/boot/splash.png", "splash.png"), + ("/usr/share/anaconda/boot/syslinux-vesa-splash.jpg", "splash.jpg"), + ("/usr/lib/anaconda-runtime/syslinux-vesa-splash.jpg", "splash.jpg")] - shutil.copyfile(background_path, isodest) + for bg_path, bg_name in bg_list: + if os.path.exists(bg_path): + shutil.copyfile(bg_path, isodir + bg_name) + return bg_name - return True + return "" def __copy_kernel_and_initramfs(self, isodir, version, index): bootdir = self._instroot + "/boot" @@ -623,9 +622,7 @@ menu separator self.__copy_syslinux_files(isodir, menu, self.__find_syslinux_mboot()) - background = "" - if self.__copy_syslinux_background(isodir + "/isolinux/splash.jpg"): - background = "splash.jpg" + background = self.__copy_syslinux_background(isodir + "/isolinux/") cfg = self.__get_basic_syslinux_config(menu = menu, background = background, -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
