livecd: linuxrc, remaster/livecd_gen_iso - s/pldcd.iso/livecd.iso

[havner]

Author: havner                       Date: Wed Jul 12 11:09:50 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- s/pldcd.iso/livecd.iso

---- Files affected:
livecd:
   linuxrc (1.27 -> 1.28) 
livecd/remaster:
   livecd_gen_iso (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: livecd/linuxrc
diff -u livecd/linuxrc:1.27 livecd/linuxrc:1.28
--- livecd/linuxrc:1.27	Wed Jul 12 13:02:14 2006
+++ livecd/linuxrc	Wed Jul 12 13:09:45 2006
@@ -143,7 +143,7 @@
 	modprobe $HDD_fs > $LOG 2>&1
 	mkdir -p /rootfs/mnt/hd
 	mount -n -o ro -t $HDD_fs /dev/$HDD_dev /rootfs/mnt/hd
-	mount -n -o ro,loop -t iso9660 /rootfs/mnt/hd/pldcd.iso /rootfs/media/LiveCD
+	mount -n -o ro,loop -t iso9660 /rootfs/mnt/hd/livecd.iso /rootfs/media/LiveCD
 else
 	echo "${MAGENTA}Searching for PLD Live CDROM${NORMAL}"
 	DEVICES="$DEVICES /dev/hd[cd] /dev/hd[ab] /dev/scd[0-9] /dev/hd[e-l]"

================================================================
Index: livecd/remaster/livecd_gen_iso
diff -u livecd/remaster/livecd_gen_iso:1.24 livecd/remaster/livecd_gen_iso:1.25
--- livecd/remaster/livecd_gen_iso:1.24	Wed Jul 12 13:02:14 2006
+++ livecd/remaster/livecd_gen_iso	Wed Jul 12 13:09:45 2006
@@ -128,10 +128,10 @@
 
 trap - INT
  
-echo "Generating pldcd.iso... "
-rm -f $MAINDIR/pldcd.iso
+echo "Generating livecd.iso... "
+rm -f $MAINDIR/livecd.iso
 cd $CD
-mkisofs -J -R -V "$LIVECD_VERSION" -o $ISODIR/pldcd.iso \
+mkisofs -J -R -V "$LIVECD_VERSION" -o $ISODIR/livecd.iso \
 -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \
 -no-emul-boot -boot-load-size 4 -boot-info-table .
 [ "$?" != 0 ] && echo fail && exit 1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/livecd/linuxrc?r1=1.27&r2=1.28&f=u
    http://cvs.pld-linux.org/livecd/remaster/livecd_gen_iso?r1=1.24&r2=1.25&f=u