liveusb/creator.py | 14 ++++++++++++++ liveusb/releases.py | 25 ++++++++++++------------- tools/syslinux.exe |binary 3 files changed, 26 insertions(+), 13 deletions(-)

New commits: commit 49501044ba2574a51b3e0718e71076d8e339f017 Author: Luke Macken lmacken@redhat.com Date: Tue Jun 9 09:14:45 2009 -0400

Update our win32 syslinux to 3.81

diff --git a/tools/syslinux.exe b/tools/syslinux.exe index c631b4b..e4b0d40 100644 Binary files a/tools/syslinux.exe and b/tools/syslinux.exe differ

commit ae11cab03a35605eca3e6fc7afb94fd25dba2b1c Author: Luke Macken lmacken@redhat.com Date: Tue Jun 9 09:10:25 2009 -0400

Add Fedora 11 releases!

diff --git a/liveusb/releases.py b/liveusb/releases.py index b4ce95b..6ded699 100644 --- a/liveusb/releases.py +++ b/liveusb/releases.py @@ -1,24 +1,23 @@ releases = ( - ## F11 Beta { - 'name': 'Fedora 11 Beta (i686)', - 'url': 'http://download.fedoraproject.org/pub/fedora/linux//releases/test/11-Beta/Li...', - 'sha256': '46b3251533402acb0b20b4d0df323e6783c32ec717921133b6c557e5cd091d0a', + 'name': 'Fedora 11 (i686)', + 'url': 'http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Live/i686/Fed...', + 'sha256': '6bbb8842bfd64e948cccd4046394a1ab67a18f62e97c36133a8fe1a10c40cfcb', }, { - 'name': 'Fedora 11 Beta KDE (i686)', - 'url': 'http://download.fedoraproject.org/pub/fedora/linux//releases/test/11-Beta/Li...', - 'sha256': '149257a5283053dcde2b0525d46ba18fe9fe07484c6c5c8c58949877dafd201d', + 'name': 'Fedora 11 KDE (i686)', + 'url': 'http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Live/i686/Fed...', + 'sha256': '543bb77cc3e2618f6d445ac346b046d0520df35cd6444c5040aebb85ca7fa2eb', }, { - 'name': 'Fedora 11 Beta (x86_64)', - 'url': 'http://download.fedoraproject.org/pub/fedora/linux//releases/test/11-Beta/Li...', - 'sha256': 'fdc068688f302decef00bdfc95f474a9612fddf505eec0840f0345f112ddd055', + 'name': 'Fedora 11 (x86_64)', + 'url': 'http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Live/x86_64/F...', + 'sha256': 'f1ca7029c35dbbcbbfd16b959bf6c2c5de6c309d60a6e87a113ee4dba4124c26', }, { - 'name': 'Fedora 11 Beta KDE (x86_64)', - 'url': 'http://download.fedoraproject.org/pub/fedora/linux//releases/test/11-Beta/Li...', - 'sha256': '4ca6dd4be116789d3c3b50b742cc9f8c07c0adc5e314fd4c144e0d08ecff0b44', + 'name': 'Fedora 11 KDE (x86_64)', + 'url': 'http://download.fedora.redhat.com/pub/fedora/linux/releases/11/Live/x86_64/F...', + 'sha256': '4fdf952afb0d27887639140f6921ff58ba74f8d633b14414b095eb54b55df405', },

{

commit aff9357adbe48b8212cf4690a6dbea4bec23635c Author: Luke Macken lmacken@redhat.com Date: Mon May 11 23:09:00 2009 -0400

Use our syslinux's menu com32 modules (#492370, #494000)

com32 modules in syslinux don't seem to have a consistent API, so workaround it by copying in the menu files from syslinux.

diff --git a/liveusb/creator.py b/liveusb/creator.py index cb21c71..11c2668 100755 --- a/liveusb/creator.py +++ b/liveusb/creator.py @@ -544,6 +544,20 @@ class LinuxLiveUSBCreator(LiveUSBCreator): syslinux_path = os.path.join(self.dest, "syslinux") shutil.move(os.path.join(self.dest, "isolinux"), syslinux_path) os.unlink(os.path.join(syslinux_path, "isolinux.cfg")) + + # Syslinux doesn't guarantee the API for its com32 modules (#492370) + for com32mod in ('vesamenu.c32', 'menu.c32'): + copied = False + for path in ('/usr/share', '/usr/lib'): + com32path = os.path.join(path, 'syslinux', com32mod) + if os.path.isfile(com32path): + self.log.debug('Copying %s on to stick' % com32path) + shutil.copyfile(com32path, os.path.join(syslinux_path, com32mod)) + copied = True + break + if copied: + break + if self.drive['fstype'] in ('ext2', 'ext3'): shutil.move(os.path.join(syslinux_path, "syslinux.cfg"), os.path.join(syslinux_path, "extlinux.cfg"))