kadischi/livecd_generator install-boot.sh, 1.6, 1.7 livecd-mkinitrd.sh, 1.11, 1.12

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10262/kadischi/livecd_generator

Modified Files:
	install-boot.sh livecd-mkinitrd.sh 
Log Message:
LIBEXECDIR for architecture dependant binaries, kernel version resolution bug fix when running under Xen Guest environment


Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- install-boot.sh	22 May 2006 05:36:38 -0000	1.6
+++ install-boot.sh	20 Jun 2006 20:30:07 -0000	1.7
@@ -3,8 +3,9 @@
 sysdir=$1
 csysdir=$2
 kernel=$3
-kernel_is_xen=$(echo $kernel | /bin/grep -G [[:alnum:]]xen0)
-kernel_version_proper=$(echo $kernel | /bin/sed -e 's|xen0||')
+kernel_is_xen0=$(echo $kernel | /bin/grep -G [[:alnum:]]xen0)
+kernel_is_xenU=$(echo $kernel | /bin/grep -G [[:alnum:]]xenU)
+kernel_version_proper=$(echo $kernel | /bin/sed -e 's|xen0||' | /bin/sed -e 's|xenU||')
 kernel_params='selinux=0'
 
  . /etc/kadischi/kadischi.conf
@@ -34,7 +35,7 @@
 /bin/cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuz
 /bin/cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/
 
-if [ ! $kernel_is_xen ]; then
+if [ ! $kernel_is_xen0 ] || [ ! $kernel_is_xenU ]; then
    if [ -d $INSTALLDIR/bootsplash ]; then
         /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/
    else
@@ -60,7 +61,7 @@
   kernel memtest
   append -
 _EOF_
-else
+elif [ $kernel_is_xen0 ]; then
    if [ -d $INSTALLDIR/bootsplash ]; then
         /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
    else
@@ -89,4 +90,33 @@
   kernel memtest
   append -
 _EOF_
+else
+   if [ -d $INSTALLDIR/bootsplash ]; then
+        /bin/cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
+   else
+        echo "Nothing found for bootsplashing."
+        nobootsplash
+   fi
+/bin/cp $sysdir/boot/initrd-$kernel $csysdir/boot/isolinux/initrd.img
+/bin/cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuz
+/bin/cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
+default linux
+prompt 1
+display xenboot.msg
+timeout 600
+F1 xenboot.msg
+F2 options.msg
+F3 general.msg
+F4 license.msg
+F5 xen.msg
+label linux
+  kernel vmlinuz
+  append initrd=initrd.img quiet $kernel_params
+label debug
+  kernel vmlinuz
+  append initrd=initrd.img INITRD_DBG=x
+label memtest86
+  kernel memtest
+  append -
+_EOF_
 fi


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- livecd-mkinitrd.sh	18 Jun 2006 18:08:45 -0000	1.11
+++ livecd-mkinitrd.sh	20 Jun 2006 20:30:07 -0000	1.12
@@ -240,7 +240,7 @@
     /bin/ln -s busybox "$MNTIMAGE/bin/$i"
 done
 
-inst /usr/libexec/kadischi/find-live-cd "$MNTIMAGE/bin/find-live-cd"
+inst $LIBEXECDIR/kadischi/find-live-cd "$MNTIMAGE/bin/find-live-cd"
 
 # Useful for debugging:
 # inst /usr/bin/strace "$MNTIMAGE/bin/strace"