livecd: remaster/livecd_gen_initrd, remaster/livecd_gen_iso - less...

[havner]

Author: havner                       Date: Mon Jul 10 14:26:30 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- less lines of messages

---- Files affected:
livecd/remaster:
   livecd_gen_initrd (1.10 -> 1.11) , livecd_gen_iso (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: livecd/remaster/livecd_gen_initrd
diff -u livecd/remaster/livecd_gen_initrd:1.10 livecd/remaster/livecd_gen_initrd:1.11
--- livecd/remaster/livecd_gen_initrd:1.10	Tue Jul  4 15:49:53 2006
+++ livecd/remaster/livecd_gen_initrd	Mon Jul 10 16:26:25 2006
@@ -10,16 +10,17 @@
 
 cd $INITRD/lib/modules
 
-echo "Purging old kernel stuff..."
+echo -n "Purging old kernel stuff... "
 rm -rf *
+echo done
 
-echo "Preparing new directory tree..."
+echo -n "Preparing new directory tree... "
 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
-	echo "There is no kernel installed in $ROOTFS"
+	echo -e "\nThere is no kernel installed in $ROOTFS"
 	exit 1
 fi
 VR=`rpm --root $ROOTFS --qf "%{VERSION}-%{RELEASE}" -q $KERNEL`
@@ -28,26 +29,26 @@
 for i in $INITRD_MODULES; do 
 	mkdir -p `dirname "$i"`;
 done
+echo done
 
-echo "Copying kernel modules..."
+echo -n "Copying kernel modules... "
 for i in $INITRD_MODULES; do
 	cp -r $ROOTFS/lib/modules/$VR/kernel/$i `dirname "$i"`;
 done
-
 find . -name "*.gz" | xargs gunzip
+echo done
 
-echo "Calculating dependencies..."
+echo -n "Calculating dependencies... "
 depmod -a -b $INITRD -F $ROOTFS/boot/System.map $VR
+echo done
 
-echo "Copying kernel image..."
+echo -n "Copying kernel/memtest/isolinux images... "
 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 done
 
-echo "Copying pci-database files..."
+echo -n "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
+echo done

================================================================
Index: livecd/remaster/livecd_gen_iso
diff -u livecd/remaster/livecd_gen_iso:1.18 livecd/remaster/livecd_gen_iso:1.19
--- livecd/remaster/livecd_gen_iso:1.18	Mon Jul 10 16:10:48 2006
+++ livecd/remaster/livecd_gen_iso	Mon Jul 10 16:26:25 2006
@@ -39,7 +39,7 @@
 #	exit 1
 #fi
 
-echo -n Running fix_live... 
+echo -n "Running fix_live... "
 chroot $ROOTFS /usr/local/bin/fix_live
 echo done
 
@@ -60,19 +60,19 @@
 mkdir $ROOTFS/usr
 mkdir $ROOTFS/boot
  
-echo -n Generating initrd... 
+echo -n "Generating initrd... "
 rm -rf $CD/boot/initrd.gz
 genromfs -f $CD/boot/initrd -d $INITRD -V "PLD initrd"
 busybox gzip $CD/boot/initrd
 echo done
 
-echo -n Generating pldram... 
+echo -n "Generating pldram... "
 rm -rf $CD/pldram
 cd $ROOTFS
 busybox tar -czf $CD/pldram *
 echo done
 
-echo -n Generating squashfs... 
+echo "Generating squashfs... "
 rm -rf $CD/pldcd
 mksquashfs $SQUASHFS/ $CD/pldcd #-info
 chmod 644 $CD/pldcd
@@ -97,7 +97,7 @@
 
 trap - SIGINT
  
-echo -n Generating pldcd.iso... 
+echo "Generating pldcd.iso... "
 rm -f $MAINDIR/pldcd.iso
 cd $CD
 mkisofs -J -R -V "PLD Live CD ${LIVECD_VERSION}" -o $ISODIR/pldcd.iso \
================================================================

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