[Fedora-livecd-list] 3 commits - imgcreate/yuminst.py livecd-tools.spec Makefile tools/livecd-iso-to-disk.sh

[Jeremy Katz]

 Makefile                    |    2 +-
 imgcreate/yuminst.py        |   10 ++++++++--
 livecd-tools.spec           |   14 +++++++++++++-
 tools/livecd-iso-to-disk.sh |    2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 0354c22595f761c8046767be816a281c6e288ae8
Author: Jeremy Katz <katzj at redhat.com>
Date:   Fri Oct 10 10:23:31 2008 -0400

    Bump version.

diff --git a/Makefile b/Makefile
index 05993c6..a463fc5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 018
+VERSION = 019
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
diff --git a/livecd-tools.spec b/livecd-tools.spec
index 2df16df..681f6cf 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -4,7 +4,7 @@
 
 Summary: Tools for building live CD's
 Name: livecd-tools
-Version: 018
+Version: 019
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -64,6 +64,18 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Fri Oct 10 2008 Jeremy Katz <katzj at redhat.com> - 019-1
+- livecd-iso-to-disk: Various other XO fixes
+- Cleanup rpmdb locks after package installation
+- Fix traceback due to lazy rhpl.keyboard import
+- Fix using groups with options (jkeating)
+- Support persistent /home on XO's internal flash
+- Fix ramdisk load addr in boot/olpc.fth for XO
+- Fix up boot from SD
+- Fix extracting boot parameters for pxe (apevec)
+- Make rpm macro information persist into the image (bkearney)
+- Support %packages --instLangs (bkearney)
+
 * Thu Aug 28 2008 Jeremy Katz <katzj at redhat.com> - 018-1
 - Use logging API for debugging messages (dhuff)
 - Some initial support for booting live images on an XO


commit c80a302bda3cc1fc55fac088613bbaa86467fe86
Author: Jeremy Katz <katzj at redhat.com>
Date:   Fri Oct 10 10:18:19 2008 -0400

    Clean up rpmdb locks after installing packages also
    
    With new versions of RPM, people can otherwise run into things they don't
    expect inside of their %post scripts.  So make things simpler for them

diff --git a/imgcreate/yuminst.py b/imgcreate/yuminst.py
index b89a6ed..04c9b40 100644
--- a/imgcreate/yuminst.py
+++ b/imgcreate/yuminst.py
@@ -69,10 +69,15 @@ class LiveCDYum(yum.YumBase):
 
         os.chmod(confpath, 0644)
 
-    def setup(self, confpath, installroot):
-        self._writeConf(confpath, installroot)
+    def _cleanupRpmdbLocks(self, installroot):
+        # cleans up temporary files left by bdb so that differing
+        # versions of rpm don't cause problems
         for f in glob.glob(installroot + "/var/lib/rpm/__db*"):
             os.unlink(f)
+
+    def setup(self, confpath, installroot):
+        self._writeConf(confpath, installroot)
+        self._cleanupRpmdbLocks(installroot)
         self.doConfigSetup(fn = confpath, root = installroot)
         self.conf.cache = 0
         self.doTsSetup()
@@ -186,4 +191,5 @@ class LiveCDYum(yum.YumBase):
         cb.filelog = False
         ret = self.runTransaction(cb)
         print ""
+        self._cleanupRpmdbLocks(self.conf.installroot)
         return ret


commit 742a7c5a1806362a927c70ed4cd79ddfb29ce9c4
Author: Jeremy Katz <katzj at redhat.com>
Date:   Thu Oct 9 00:11:56 2008 -0400

    Fix typo with --extra-kernel-args

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index f385dcb..d48f922 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -444,7 +444,7 @@ fi
 echo "Updating boot config file"
 # adjust label and fstype
 sed -i -e "s/CDLABEL=[^ ]*/$USBLABEL/" -e "s/rootfstype=[^ ]*/rootfstype=$USBFS/" $BOOTCONFIG
-if [ -n "$kernelargs" ]; then sed -i -e "s/liveimg/liveimg ${kernelargs}/" $BOOTCONFIG.cfg ; fi
+if [ -n "$kernelargs" ]; then sed -i -e "s/liveimg/liveimg ${kernelargs}/" $BOOTCONFIG ; fi
 
 if [ -n "$overlaysizemb" ]; then
     echo "Initializing persistent overlay file"