imgcreate/live.py | 9 ++------- tools/livecd-iso-to-disk.sh | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-)
New commits: commit 673c2179a002f68b68ea8ebfac1f74f15a3702dd Author: Brian C. Lane <[email protected]> Date: Thu Apr 12 11:48:13 2012 -0700 remove kernel and initrd from EFI/BOOT (#811438) The kernel and initrd don't need to be in the EFI/BOOT directory, they are already in the isolinux dir. A side-effect of this is that the efiboot.img and macboot.img were including them as well, causing the image size to be larger than it needed to be. livecd-iso-to-disk has also been adjusted to handle the new path in the EFI boot config. diff --git a/imgcreate/live.py b/imgcreate/live.py index adcf34f..c5c9db8 100755 --- a/imgcreate/live.py +++ b/imgcreate/live.py @@ -715,8 +715,8 @@ hiddenmenu args["rootlabel"] = "CDLABEL=%(fslabel)s" % args return """title %(long)s findiso - kernel /EFI/BOOT/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s - initrd /EFI/BOOT/initrd%(index)s.img + kernel /isolinux/vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s + initrd /isolinux/initrd%(index)s.img """ %args def __get_efi_image_stanzas(self, isodir, name): @@ -755,11 +755,6 @@ hiddenmenu shutil.rmtree(isodir + "/EFI") return - for f in os.listdir(isodir + "/isolinux"): - os.link("%s/isolinux/%s" %(isodir, f), - "%s/EFI/BOOT/%s" %(isodir, f)) - - cfg = self.__get_basic_efi_config(name = self.name, timeout = self._timeout) cfg += self.__get_efi_image_stanzas(isodir, self.name) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index cc682a0..8f8f6c4 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1253,6 +1253,7 @@ fi # EFI images are in $SYSLINUXPATH now if [ -n "$efi" ]; then + sed -i -e "s;/isolinux/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;/images/pxeboot/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI sed -i -e "s;findiso;;g" $BOOTCONFIG_EFI fi commit b6c7ebfa713065a5ff126b18943ad5da6b57e914 Author: Brian C. Lane <[email protected]> Date: Thu Apr 12 11:08:15 2012 -0700 fix syntax problem in detectsrctype diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 533a13d..cc682a0 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -704,7 +704,7 @@ detectsrctype() { srctype=live return fi - if [ -e $SRCMNT/images/install.img -o $SRCMNT/isolinux/initrd.img ]; then + if [ -e $SRCMNT/images/install.img -o -e $SRCMNT/isolinux/initrd.img ]; then if [ -n "$packages" ]; then srctype=installer else -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
