[Fedora-livecd-list] 3 commits - imgcreate/yuminst.py tools/livecd-creator

[Jeremy Katz]

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

New commits:
commit 9a6e8436eeb167981afef28a69afa2f49ca61d26
Author: Jan Kratochvil <jan.kratochvil(a)redhat.com&gt;
Date:   Mon Jan 12 15:18:50 2009 -0500

    Keep cache with --cache (#479716)
    
    Specifying --cache works if the image creation fails.  It gets reused
    afterwards.  But if we successfully create an image YUM itself deletes all the
    rpm files and next run of livecd-creator starts to download it all again.

diff --git a/imgcreate/yuminst.py b/imgcreate/yuminst.py
index 04c9b40..080034b 100644
--- a/imgcreate/yuminst.py
+++ b/imgcreate/yuminst.py
@@ -62,6 +62,7 @@ class LiveCDYum(yum.YumBase):
         conf += "plugins=0\n"
         conf += "reposdir=\n"
         conf += "failovermethod=priority\n"
+        conf += "keepcache=1\n"
 
         f = file(confpath, "w+")
         f.write(conf)


commit d1e4c3eaf2500a72de33f0cc7d651ff43ba69ed4
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Mon Jan 12 15:16:35 2009 -0500

    Use absolute path for tmpdir (#479719)

diff --git a/tools/livecd-creator b/tools/livecd-creator
index 0390cc4..211f6ee 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -112,7 +112,7 @@ def main():
     ks = imgcreate.read_kickstart(options.kscfg)
 
     creator = imgcreate.LiveImageCreator(ks, name, fs_label)
-    creator.tmpdir = options.tmpdir
+    creator.tmpdir = os.path.abspath(options.tmpdir)
     creator.skip_compression = options.skip_compression
     creator.skip_minimize = options.skip_minimize
 


commit 1f0a0af690725290661086e5aebe73618f3117d6
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Mon Jan 12 15:15:43 2009 -0500

    Use absolute path to cachedir (#479716)

diff --git a/tools/livecd-creator b/tools/livecd-creator
index 719c874..0390cc4 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -117,7 +117,7 @@ def main():
     creator.skip_minimize = options.skip_minimize
 
     try:
-        creator.mount(options.base_on, options.cachedir)
+        creator.mount(options.base_on, os.path.abspath(options.cachedir))
         creator.install()
         creator.configure()
         if options.give_shell: