livecd: functions-live, remaster/livecd_gen_initrd - $ROOTFS fixes

[havner]

Author: havner                       Date: Tue Jul 11 11:23:02 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- $ROOTFS fixes

---- Files affected:
livecd:
   functions-live (1.16 -> 1.17) 
livecd/remaster:
   livecd_gen_initrd (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: livecd/functions-live
diff -u livecd/functions-live:1.16 livecd/functions-live:1.17
--- livecd/functions-live:1.16	Mon Jul 10 16:03:32 2006
+++ livecd/functions-live	Tue Jul 11 13:22:57 2006
@@ -189,7 +189,7 @@
 
 check_deps() {
 while [ "$#" != "0" ]; do
-	if [ ! -f "$1" -a ! -f "`which $1`" ]; then
+	if [ ! -f "$ROOTFS/$1" -a ! -f "`chroot $ROOTFS which $1`" ]; then
 		echo "Install $1 before running this script."
 		FAIL=true
 	fi

================================================================
Index: livecd/remaster/livecd_gen_initrd
diff -u livecd/remaster/livecd_gen_initrd:1.11 livecd/remaster/livecd_gen_initrd:1.12
--- livecd/remaster/livecd_gen_initrd:1.11	Mon Jul 10 16:26:25 2006
+++ livecd/remaster/livecd_gen_initrd	Tue Jul 11 13:22:57 2006
@@ -45,7 +45,7 @@
 echo -n "Copying kernel/memtest/isolinux images... "
 cp -f $ROOTFS/boot/vmlinuz $CD/boot
 cp -f $ROOTFS/boot/memtest86+ $CD/boot/memtest
-cp -f $ROOTS/usr/lib/syslinux/isolinux.bin $CD/boot/isolinux/
+cp -f $ROOTFS/usr/lib/syslinux/isolinux.bin $CD/boot/isolinux/
 echo done
 
 echo -n "Copying pci-database files... "
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/functions-live?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/livecd/remaster/livecd_gen_initrd?r1=1.11&r2=1.12&f=u