livecd: remaster/livecd_gen_initrd - kernel detection loop

[havner]

Author: havner                       Date: Thu Jul 27 07:56:25 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- kernel detection loop

---- Files affected:
livecd/remaster:
   livecd_gen_initrd (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: livecd/remaster/livecd_gen_initrd
diff -u livecd/remaster/livecd_gen_initrd:1.18 livecd/remaster/livecd_gen_initrd:1.19
--- livecd/remaster/livecd_gen_initrd:1.18	Sat Jul 22 01:24:38 2006
+++ livecd/remaster/livecd_gen_initrd	Thu Jul 27 09:56:20 2006
@@ -17,15 +17,18 @@
 ok
 
 show "Preparing new directory tree"; busy
-if rpm --root $ROOTFS -q kernel-grsecurity > /dev/null; then
-	KERNEL=kernel-grsecurity
-elif rpm --root $ROOTFS -q kernel > /dev/null; then
-	KERNEL=kernel
-else
+for I in kernel-gresecurity kernel kernel26 kernel24; do
+	if rpm --root $ROOTFS -q $I > /dev/null; then
+		KERNEL=$I
+		break
+	fi
+done
+if [ ! "$KERNEL" ]; then
 	echo -e "\nThere is no kernel installed in $ROOTFS"
 	fail
 	exit 1
 fi
+
 VR=`rpm --root $ROOTFS --qf "%{VERSION}-%{RELEASE}" -q $KERNEL`
 cd $INITRD/lib/modules
 mkdir -p $VR/kernel
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/remaster/livecd_gen_initrd?r1=1.18&r2=1.19&f=u