[Fedora-livecd-list] Branch 'f13-branch' - 2 commits - Makefile tools/livecd-iso-to-disk.sh

[Brian C. Lane]

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

New commits:
commit 774d8adcc955fe9f03ff9396e0be61c068d6b369
Author: Brian C. Lane <bcl at redhat.com>
Date:   Wed Jun 1 14:07:18 2011 -0700

    Version 13.3

diff --git a/Makefile b/Makefile
index 34349d5..c62a6fa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 13.2
+VERSION = 13.3
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}


commit 1bc3c2e1c8d868412ef93de2d300c33c9074dd7b
Author: Brian C. Lane <bcl at redhat.com>
Date:   Wed Jun 1 13:39:18 2011 -0700

    extlinux doesn't support ext4 or btrfs on F13 (#709778)
    
    F13 is using extlinux 3.84 which does not support ext3 or btrfs. Remove
    support for these and setup the USB as ext3 instead.

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index a2e7d34..3b6c151 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -234,7 +234,7 @@ createEXTFSLayout() {
     getpartition ${device#/dev/}
     USBDEV=${device}${partnum}
     umount $USBDEV &> /dev/null
-    /sbin/mkfs.ext4 -L LIVE $USBDEV
+    /sbin/mkfs.ext3 -L LIVE $USBDEV
     USBLABEL="UUID=$(/sbin/blkid -s UUID -o value $USBDEV)"
 }
 
@@ -271,8 +271,8 @@ checkFilesystem() {
 
     USBFS=$(/sbin/blkid -s TYPE -o value $dev)
     if [ "$USBFS" != "vfat" ] && [ "$USBFS" != "msdos" ]; then
-        if [ "$USBFS" != "ext2" ] && [ "$USBFS" != "ext3" ] && [ "$USBFS" != "ext4" ] && [ "$USBFS" != "btrfs" ]; then
-	    echo "USB filesystem must be vfat, ext[234] or btrfs"
+        if [ "$USBFS" != "ext2" ] && [ "$USBFS" != "ext3" ]; then
+	    echo "USB filesystem must be vfat, ext[23]"
 	    exitclean
         fi
     fi
@@ -289,7 +289,7 @@ checkFilesystem() {
 	    echo "Need to have a filesystem label or UUID for your USB device"
 	    if [ "$USBFS" = "vfat" -o "$USBFS" = "msdos" ]; then
 		echo "Label can be set with /sbin/dosfslabel"
-	    elif [ "$USBFS" = "ext2" -o "$USBFS" = "ext3" -o "$USBFS" = "ext4" ]; then
+	    elif [ "$USBFS" = "ext2" -o "$USBFS" = "ext3" ]; then
 		echo "Label can be set with /sbin/e2label"
 	    elif [ "$USBFS" = "btrfs" ]; then
                 echo "Eventually you'll be able to use /sbin/btrfs filesystem label to add a label."
@@ -925,7 +925,7 @@ if [ -z "$multi" ]; then
         else
             syslinux $USBDEV
         fi
-    elif [ "$USBFS" == "ext2" -o "$USBFS" == "ext3" -o "$USBFS" == "ext4" -o "$USBFS" == "btrfs" ]; then
+    elif [ "$USBFS" == "ext2" -o "$USBFS" == "ext3" ]; then
         # extlinux expects the config to be named extlinux.conf
         # and has to be run with the file system mounted
         mv $USBMNT/$SYSLINUXPATH/isolinux.cfg $USBMNT/$SYSLINUXPATH/extlinux.conf