livecd: remaster/livecd_gen_iso, remaster/livecd_remaster_prep - n...

[havner]

Author: havner                       Date: Thu Jan 26 20:08:29 2006 GMT
Module: livecd                        Tag: HEAD
---- Log message:
- no need for $SQUASHFS dir to hand around empty

---- Files affected:
livecd/remaster:
   livecd_gen_iso (1.10 -> 1.11) , livecd_remaster_prep (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: livecd/remaster/livecd_gen_iso
diff -u livecd/remaster/livecd_gen_iso:1.10 livecd/remaster/livecd_gen_iso:1.11
--- livecd/remaster/livecd_gen_iso:1.10	Thu Jan 26 21:04:07 2006
+++ livecd/remaster/livecd_gen_iso	Thu Jan 26 21:08:24 2006
@@ -38,6 +38,8 @@
 chroot $ROOTFS /usr/local/bin/fix_live
 echo done
 
+mkdir $SQUASHFS
+
 mv $ROOTFS/bin $SQUASHFS/bin-bind
 mv $ROOTFS/sbin $SQUASHFS/sbin-bind
 mv $ROOTFS/lib $SQUASHFS/lib-bind
@@ -83,6 +85,8 @@
 mv $SQUASHFS/usr-bind $ROOTFS/usr
 mv $SQUASHFS/boot-bind $ROOTFS/boot
 mv $SQUASHFS/* $ROOTFS/live/
+
+rmdir $SQUASHFS
  
 echo Generating pldcd.iso
 rm -f $MAINDIR/pldcd.iso

================================================================
Index: livecd/remaster/livecd_remaster_prep
diff -u livecd/remaster/livecd_remaster_prep:1.11 livecd/remaster/livecd_remaster_prep:1.12
--- livecd/remaster/livecd_remaster_prep:1.11	Sun Feb 13 23:23:57 2005
+++ livecd/remaster/livecd_remaster_prep	Thu Jan 26 21:08:24 2006
@@ -48,7 +48,6 @@
 
 mkdir $CD
 mkdir $INITRD
-mkdir $SQUASHFS
 mkdir $ROOTFS
 
 #cp -dpR $MNT_CDROM/Ogg $CD/
================================================================

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