SVN: livecd/mklive/mklive

[qwiat]

Author: qwiat
Date: Sun Jul 10 12:37:25 2011
New Revision: 12257

Modified:
   livecd/mklive/mklive
Log:
- added support for xz compression
- added support for mounting by LABEL


Modified: livecd/mklive/mklive
==============================================================================
--- livecd/mklive/mklive	(original)
+++ livecd/mklive/mklive	Sun Jul 10 12:37:25 2011
@@ -172,8 +172,8 @@
 for arg in $@
 do
         case $arg in
-                --lzma) compr=lzma ;;
-                --gzip) compr=gzip ;;
+                --lzma) compr=lzma; squashfscompr=xz  ;;
+                --gzip) compr=gzip; squashfscompr=gzip ;;
 		--tpl=*) templatesDir=$(echo $arg | sed 's/.*tpl=//;s/--.*//') ;;
 		--bootsplash=*)
 			bootsplash_arg=1
@@ -202,6 +202,9 @@
 [ ! -d $sys_source ] && die "$sys_source is not a directory"
 mkroot=$(dirname $0)
 
+# read configuration from ~/.mkliverc
+[ -f ~/.mkliverc ] && . ~/.mkliverc
+[ -z "$VOLID" ] && VOLID="mkLive-Live-CD" # volid may not be empty
 
 # preparing temp dirs
 rm -rf /tmp/$0_tmp_*
@@ -216,7 +219,10 @@
 echo "compression method:   $compr"	 
 echo "initrd temporary dir: $tmp_initrd"	 
 echo "iso temporary dir:    $tmp_iso_root"	 
-echo "templates directory:  $mkroot/$templatesDir"	 
+echo "templates directory:  $mkroot/$templatesDir"
+echo "application:          $APPLICATION"
+echo "preparer:             $PREPARER"
+echo "volid:                $VOLID"
 echo ""
 
 # is templates exists
@@ -248,12 +254,9 @@
 # create initrd
 create_initrd $tmp_iso_root/boot/initrd.img || die "Creating initrd image failed."
 
-# read configuration from ~/.mkliverc
-[ -f ~/.mkliverc ] && . ~/.mkliverc
-
 # ceate live
 echo "Creating squashfs filesystem: $tmp_iso_root/$live_rootfs_archive..."
-mksquashfs  $sys_source $tmp_iso_root/$live_rootfs_archive -comp $compr > /dev/null || die "Creating live rootfs failed"
+mksquashfs  $sys_source $tmp_iso_root/$live_rootfs_archive -comp $squashfscompr > /dev/null || die "Creating live rootfs failed"
 echo "Creating ISO image: $dst_iso..."
 mkisofs -o $dst_iso --publisher "PLD Linux" -b isolinux/isolinux.bin -c isolinux/boot.cat \
 	-no-emul-boot -boot-load-size 4 -boot-info-table -l -R \