2 commits - livecd-tools.spec Makefile tools/livecd-iso-to-disk.sh

[Jeremy Katz]

Makefile                    |    2 +-
 livecd-tools.spec           |   13 ++++++++++---
 tools/livecd-iso-to-disk.sh |   13 +++++++++++--
 3 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 75bd5129a2ffb862529df8d7cd589a362c028353
Author: Jeremy Katz 
Date:   Thu Mar 6 19:39:05 2008 -0500

Bump version

diff --git a/Makefile b/Makefile
index 6efe58c..22c9c2e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@

-VERSION = 014
+VERSION = 015

INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
diff --git a/livecd-tools.spec b/livecd-tools.spec
index a789460..56b82d4 100644
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
@@ -4,7 +4,7 @@

Summary: Tools for building live CD's
 Name: livecd-tools
-Version: 014
+Version: 015
 Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
@@ -53,8 +53,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/livecd-creator
 %{_bindir}/livecd-iso-to-disk
 %{_bindir}/livecd-iso-to-pxeboot
-%dir /usr/lib/livecd-creator
-/usr/lib/livecd-creator/mayflower
 %dir %{_datadir}/livecd-tools
 %{_datadir}/livecd-tools/*
 %{_bindir}/image-creator
@@ -64,6 +62,15 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc

%changelog
+* Thu Mar  6 2008 Jeremy Katz  - 015-1
+- Support for using live isos with pxe booting (Richard W.M. Jones and 
+  Chris Lalancette)
+- Fixes for SELinux being disabled (Warren Togami)
+- Stop using mayflower for building the initrd; mkinitrd can do it now
+- Create a minimal /dev rather than using the host /dev (Warren Togami)
+- Support for persistent overlays when using a USB stick (based on support 
+  by Douglas McClendon)
+
 * Tue Feb 12 2008 Jeremy Katz  - 014-1
 - Rework to provide a python API for use by other tools (thanks to 
   markmc for a lot of the legwork here)

commit 6a4ea132ac61a74e6c066d44cdb077ec47164d4b
Author: Jeremy Katz 
Date:   Thu Mar 6 19:35:47 2008 -0500

Fixes to avoid problems on VFAT usb sticks

If we're using a VFAT formatted stick, don't allow an overlay > 2 GB to avoid
    corruption.  Also, VFAT doesn't really allow for sparse files and the kernel
    gets unhappy when you try to make one.

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 00465e3..5aeeca7 100644
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -197,6 +197,11 @@ checkPartActive $USBDEV
 checkMBR $USBDEV
 [ -n $resetmbr ] && resetMBR $USBDEV

+if [ -n "$overlaysizemb" -a "$USBFS" = "vfat" -a "$overlaysizemb" -gt 2047 ]; then
+    echo "Can't have an overlay greater than 2048MB on VFAT"
+    exitclean
+fi
+
 # FIXME: would be better if we had better mountpoints
 CDMNT=$(mktemp -d /media/cdtmp.XXXXXX)
 mount -o loop $ISO $CDMNT || exitclean
@@ -238,8 +243,12 @@ sed -i -e "s/CDLABEL=[^ ]*/$USBLABEL/" -e "s/rootfstype=[^ ]*/rootfstype=$USBFS/
 if [ -n "$overlaysizemb" ]; then
     echo "Initializing persistent overlay file"
     OVERFILE="overlay-$( /lib/udev/vol_id -l $USBDEV )-$( /lib/udev/vol_id -u $USBDEV )"
-    dd if=/dev/null of=$USBMNT/LiveOS/$OVERFILE \
-	count=1 bs=1M seek=$overlaysizemb
+    if [ "$USBFS" = "vfat" ]; then
+	# vfat can't handle sparse files
+	dd if=/dev/zero of=$USBMNT/LiveOS/$OVERFILE count=$overlaysizemb bs=1M
+    else
+	dd if=/dev/null of=$USBMNT/LiveOS/$OVERFILE count=1 bs=1M seek=$overlaysizemb
+    fi
     sed -i -e "s/liveimg/liveimg overlay=${USBLABEL}/" \
    $USBMNT/$SYSLINUXPATH/isolinux.cfg
     sed -i -e "s/\ ro\ /\ rw\ /" \