kadischi/livecd_generator install-boot.sh, 1.4, 1.5 livecd-mkinitrd.sh, 1.8, 1.9

[Jasper O'neal Hartline (autopsy)]

Author: autopsy

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

Modified Files:
	install-boot.sh livecd-mkinitrd.sh 
Log Message:
FC4-compatibility and optional bootsplash modification


Index: install-boot.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- install-boot.sh	30 Mar 2006 05:46:06 -0000	1.4
+++ install-boot.sh	17 May 2006 19:10:21 -0000	1.5
@@ -9,6 +9,23 @@
 
  . /etc/kadischi/kadischi.conf
 
+nobootsplash() {
+         cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
+default linux
+prompt 1
+timeout 600
+label linux
+  kernel vmlinuz
+  append initrd=initrd.img quiet $kernel_params
+label debug
+  kernel vmlinuz
+  append initrd=initrd.img INITRD_DBG=x
+_EOF_
+
+         exit 0
+
+}
+
 if [ -x $sysdir/usr/bin/rhgb ]; then
    kernel_params="$kernel_params rhgb"
 fi
@@ -18,7 +35,12 @@
 cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/
 
 if [ ! $kernel_is_xen ]; then
-cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/
+   if [ -d $INSTALLDIR/bootsplash ]; then
+        cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/
+   else
+        echo "Nothing found for bootsplashing."
+        nobootsplash
+   fi
 cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_
 default linux
 prompt 1
@@ -39,7 +61,12 @@
   append -
 _EOF_
 else
-cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
+   if [ -d $INSTALLDIR/bootsplash ]; then
+        cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/
+   else
+        echo "Nothing found for bootsplashing."
+        nobootsplash
+   fi
 cp $sysdir/boot/xen.gz-$kernel_version_proper $csysdir/boot/isolinux/xen.gz
 cp /usr/lib/syslinux/mboot.c32 $csysdir/boot/isolinux/
 cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- livecd-mkinitrd.sh	11 Apr 2006 08:26:22 -0000	1.8
+++ livecd-mkinitrd.sh	17 May 2006 19:10:21 -0000	1.9
@@ -253,7 +253,11 @@
     inst $rootdir/sbin/MAKEDEV "$MNTIMAGE/sbin/MAKEDEV"
 fi
 
-inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist"
+if [ -f $rootdir/etc/modprobe.conf.dist ]; then
+     inst $rootdir/etc/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.conf.dist"
+else
+     inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist"
+fi
 inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep"
 
 MODULES=$(findmodules drivers/parport drivers/block/loop.ko fs/squashfs)