[Fedora-livecd-list] 2 commits - imgcreate/live.py tools/livecd-iso-to-disk.sh

[Jeremy Katz]

 imgcreate/live.py           |    8 ++++----
 tools/livecd-iso-to-disk.sh |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c0402da9ca6a9430aeb3bcfcb8440b2fb2c27ae7
Author: Michael Ansel <michael.ansel at gmail.com>
Date:   Fri Nov 7 14:14:08 2008 -0500

    Fix up Xen paths

diff --git a/imgcreate/live.py b/imgcreate/live.py
index 17d3037..362d68a 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -316,7 +316,7 @@ class x86LiveImageCreator(LiveImageCreatorBase):
     def __copy_syslinux_files(self, isodir, menu, mboot = None):
         files = ["isolinux.bin", menu]
         if mboot:
-            files += mboot
+            files += [mboot]
 
         for f in files:
             path = self._instroot + "/usr/lib/syslinux/" + f
@@ -348,8 +348,8 @@ class x86LiveImageCreator(LiveImageCreatorBase):
                         isodir + "/isolinux/initrd" + index + ".img")
 
         is_xen = False
-        if os.path.exists(bootdir + "/boot/xen.gz-" + version[:-3]):
-            shutil.copyfile(bootdir + "/boot/xen.gz-" + version[:-3],
+        if os.path.exists(bootdir + "/xen.gz-" + version[:-3]):
+            shutil.copyfile(bootdir + "/xen.gz-" + version[:-3],
                             isodir + "/isolinux/xen" + index + ".gz")
             is_xen = True
 
@@ -399,7 +399,7 @@ menu hiddenrow 5
             template = """label %(short)s
   menu label %(long)s
   kernel mboot.c32
-  append xen%(index)s.gz --- vmlinuz%(index)s --- initrd%(index)s.img  root=CDLABEL=%(fslabel)s rootfstype=iso9660 %(liveargs)s %(extra)s
+  append xen%(index)s.gz --- vmlinuz%(index)s root=CDLABEL=%(fslabel)s rootfstype=iso9660 %(liveargs)s %(extra)s --- initrd%(index)s.img
 """
         return template % args
 


commit d3a0e75adfcdbaa319e6b0093679c20c67443b2b
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Oct 28 21:33:41 2008 -0400

    Fix up whitespace horkiness

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 239846e..d3e81cc 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -280,9 +280,9 @@ while [ $# -gt 2 ]; do
 	--xo-no-home)
 	    xonohome=1
 	    ;;
-    --compress)
-        skipcompress=""
-        ;;
+	--compress)
+	    skipcompress=""
+	    ;;
 	--skipcompress)
 	    skipcompress=1
 	    ;;