livecd: remaster/livecd_gen_initrd - update few more things

[havner]

Author: havner                       Date: Tue Jul  4 13:49:58 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- update few more things

---- Files affected:
livecd/remaster:
   livecd_gen_initrd (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: livecd/remaster/livecd_gen_initrd
diff -u livecd/remaster/livecd_gen_initrd:1.9 livecd/remaster/livecd_gen_initrd:1.10
--- livecd/remaster/livecd_gen_initrd:1.9	Tue Jul  4 15:28:24 2006
+++ livecd/remaster/livecd_gen_initrd	Tue Jul  4 15:49:53 2006
@@ -2,24 +2,11 @@
 # Adam Gołębiowski <adamg at pld-linux.org> 2005
 # $Id$
 
-# TODO: memtest, isolinux, pci-database (upgrade everything)
-
 . /etc/rc.d/init.d/functions-live
 
 check_root
 check_config
-check_deps genromfs
-
-# You don't even have to tell mi it's ugly
-INITRD_FILES="
-drivers/block/loop.ko.gz
-drivers/ide/*
-drivers/scsi/*
-fs/isofs/*
-fs/nls/nls_cp437.ko.gz
-fs/nls/nls_iso8859-1.ko.gz
-fs/squashfs/*
-lib/zlib_inflate/*"
+check_deps genromfs /usr/share/pci-database/ide.pci /boot/memtest86+ /usr/lib/syslinux/isolinux.bin
 
 cd $INITRD/lib/modules
 
@@ -35,24 +22,32 @@
 	echo "There is no kernel installed in $ROOTFS"
 	exit 1
 fi
-V=`rpm --root $ROOTFS --qf "%{VERSION}" -q $KERNEL`
-R=`rpm --root $ROOTFS --qf "%{RELEASE}" -q $KERNEL`
-mkdir -p $V-$R/kernel
-#ln -s $V-$R $V
-cd $V-$R/kernel
-for i in $INITRD_FILES; do 
+VR=`rpm --root $ROOTFS --qf "%{VERSION}-%{RELEASE}" -q $KERNEL`
+mkdir -p $VR/kernel
+cd $VR/kernel
+for i in $INITRD_MODULES; do 
 	mkdir -p `dirname "$i"`;
 done
 
 echo "Copying kernel modules..."
-for i in $INITRD_FILES; do
-	cp -r $ROOTFS/lib/modules/$V-$R/kernel/$i `dirname "$i"`;
+for i in $INITRD_MODULES; do
+	cp -r $ROOTFS/lib/modules/$VR/kernel/$i `dirname "$i"`;
 done
 
 find . -name "*.gz" | xargs gunzip
 
 echo "Calculating dependencies..."
-depmod -a -b $INITRD -F $ROOTFS/boot/System.map $V-$R
+depmod -a -b $INITRD -F $ROOTFS/boot/System.map $VR
 
 echo "Copying kernel image..."
 cp -f $ROOTFS/boot/vmlinuz $CD/boot
+
+echo "Copying memtest image..."
+cp -f $ROOTFS/boot/memtest86+ $CD/boot/memtest
+
+echo "Copying isolinux image..."
+cp -f $ROOTS/usr/lib/syslinux/isolinux.bin $CD/boot/isolinux/
+
+echo "Copying pci-database files..."
+rm -f $INITRD/pci/*
+cp -f $ROOTS/usr/share/pci-database/ide.pci $ROOTS/usr/share/pci-database/scsi.pci $ROOTS/usr/share/pci-database/sata.pci $INITRD/pci
================================================================

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