[Fedora-livecd-list] 3 commits - config/livecd-fedora-base-desktop.ks imgcreate/kickstart.py tools/livecd-iso-to-disk.sh

[Jeremy Katz]

 config/livecd-fedora-base-desktop.ks |    2 +-
 imgcreate/kickstart.py               |    2 +-
 tools/livecd-iso-to-disk.sh          |    8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit daa1ab63f6bc46a7a0e0e46dff116876487bb72c
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Mon Jun 2 15:40:43 2008 -0400

    Fix mounting of live image backing store on /mnt/live

diff --git a/config/livecd-fedora-base-desktop.ks b/config/livecd-fedora-base-desktop.ks
index 5da37aa..14d49a4 100644
--- a/config/livecd-fedora-base-desktop.ks
+++ b/config/livecd-fedora-base-desktop.ks
@@ -87,7 +87,7 @@ exists() {
 touch /.liveimg-configured
 
 # mount live image
-if [ -b /dev/live ]; then
+if [ -b \`readlink -f /dev/live\` ]; then
    mkdir -p /mnt/live
    mount -o ro /dev/live /mnt/live
 fi


commit a39924713953eccd14ff6ad8bbcfe28afb721bb7
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Mon Jun 2 14:09:33 2008 -0400

    More fixes for using a loopback device as the blockdev

diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 69e97e3..3e1979b 100644
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -41,7 +41,7 @@ getdisk() {
     DEV=$1
 
     if [[ "$DEV" =~ "/dev/loop*" ]]; then
-       device="/dev/$device"
+       device="$DEV"
        return
     fi
 
@@ -60,6 +60,9 @@ getdisk() {
 }
 
 resetMBR() {
+    if [[ "$DEV" =~ "/dev/loop*" ]]; then
+       return
+    fi
     getdisk $1
     if [ -f /usr/lib/syslinux/mbr.bin ]; then
 	cat /usr/lib/syslinux/mbr.bin > $device
@@ -98,6 +101,9 @@ checkPartActive() {
     if [ "$dev" = "$device" ]; then
 	return
     fi
+    if [[ "$dev" =~ "/dev/loop*" ]]; then
+        return
+    fi
 
     if [ "$(/sbin/fdisk -l $device 2>/dev/null |grep $dev |awk {'print
$2;'})" != "*" ]; then
 	echo "Partition isn't marked bootable!"


commit 7d8dfdedb9fd3f20058b818980c1e39035e05851
Author: Jeremy Katz <katzj(a)redhat.com&gt;
Date:   Mon Jun 2 13:35:05 2008 -0400

    Use right variable when looking for executables
    
    When checking to see if executables exist before running them, use
    the right value for the instroot

diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 8f43f7c..6e946b2 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -108,7 +108,7 @@ class KickstartConfig(object):
         os.chdir("/")
 
     def call(self, args):
-        if not os.path.exists("%s/%s" %(self.chroot, args[0])):
+        if not os.path.exists("%s/%s" %(self.instroot, args[0])):
             raise errors.KickstartError("Unable to run %s!" %(args))
         subprocess.call(args, preexec_fn = self.chroot)