[Fedora-livecd-list] 2 commits - imgcreate/live.py tools/livecd-creator

[Jeremy Katz]

 imgcreate/live.py    |    2 +-
 tools/livecd-creator |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit ea5320abc1500552e17a95710e0fb989b001c41b
Author: Jeremy Katz <katzj at redhat.com>
Date:   Wed Jan 14 22:19:28 2009 -0500

    Fix traceback when not specifying a cachedir

diff --git a/tools/livecd-creator b/tools/livecd-creator
index 211f6ee..1aab882 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -115,9 +115,11 @@ def main():
     creator.tmpdir = os.path.abspath(options.tmpdir)
     creator.skip_compression = options.skip_compression
     creator.skip_minimize = options.skip_minimize
+    if options.cachedir:
+        options.cachedir = os.path.abspath(options.cachedir)
 
     try:
-        creator.mount(options.base_on, os.path.abspath(options.cachedir))
+        creator.mount(options.base_on, options.cachedir)
         creator.install()
         creator.configure()
         if options.give_shell:


commit 1435e38ad9dda0d5440e028a5f38fe2a3ccf8346
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Jan 13 09:23:43 2009 -0500

    Use the explicit form for ppc (not sure how I missed it) - thanks to Bruno Wolf

diff --git a/imgcreate/live.py b/imgcreate/live.py
index d99659a..a6a9c46 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -663,7 +663,7 @@ image=/ppc/ppc%(bit)s/vmlinuz
   label=%(short)s
   initrd=/ppc/ppc%(bit)s/initrd.img
   read-only
-  append="root=CDLABEL=%(fslabel)s rootfstype=udf,iso9660 %(liveargs)s %(extra)s"
+  append="root=CDLABEL=%(fslabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s"
 """ % args