SliTaz Repositories

     1.1 --- a/tazlito	Tue Dec 11 19:17:15 2007 +0100
     1.2 +++ b/tazlito	Tue Dec 11 19:19:00 2007 +0100
     1.3 @@ -19,7 +19,6 @@
     1.4  TMP_DIR=/tmp/tazlito-$$-$RANDOM
     1.5  TOP_DIR=`pwd`
     1.6  INITRAMFS=rootfs.gz
     1.7 -LZMA_INITRAMFS=rootfs.lz
     1.8  LOCALSTATE=/var/lib/tazpkg
     1.9  INSTALLED=$LOCALSTATE/installed
    1.10  CACHE_DIR=/var/cache/tazpkg
    1.11 @@ -179,20 +178,14 @@
    1.12  	echo ""
    1.13  	# Use lzma if installed
    1.14  	if [ -x /usr/bin/lzma ]; then
    1.15 -		echo -n "Generating cpio archive... "
    1.16 -		find . -print | cpio -o -H newc | lzma e -si -so > $DISTRO/$LZMA_INITRAMFS
    1.17 -		cd $DISTRO
    1.18 -		mv $LZMA_INITRAMFS $ROOTCD/boot
    1.19 -		# Remove eventual gziped initramfs and sed isolinux.cfg for the path
    1.20 -		# to lzma rootfs ($LZMA_INITRAMFS)
    1.21 -		rm -f $ROOTCD/boot/$INITRAMFS
    1.22 -		sed -i s/$INITRAMFS/$LZMA_INITRAMFS/g $ROOTCD/boot/isolinux/isolinux.cfg
    1.23 +		echo -n "Generating lzma'ed initramfs... "
    1.24 +		find . -print | cpio -o -H newc | lzma e -si -so > $DISTRO/$INITRAMFS
    1.25  	else
    1.26  		echo -n "Generating gziped initramfs... "
    1.27  		find . -print | cpio -o -H newc | gzip -9 > $DISTRO/$INITRAMFS
    1.28 -		cd $DISTRO
    1.29 -		mv $INITRAMFS $ROOTCD/boot
    1.30  	fi
    1.31 +	cd $DISTRO
    1.32 +	mv $INITRAMFS $ROOTCD/boot
    1.33  }
    1.34  
    1.35  # Print ISO and rootfs size.
    1.36 @@ -204,11 +197,7 @@
    1.37  	echo "Build date      : `date +%Y%m%d\ \at\ \%H:%M:%S`"
    1.38  	echo "Packages        : `ls -1 $ROOTFS/var/lib/tazpkg/installed | wc -l`"
    1.39  	echo "Rootfs size     : `du -sh $ROOTFS`"
    1.40 -	if [ -f $LZMA_INITRAMFS ]; then
    1.41 -		echo "Initramfs size  : `du -sh $ROOTCD/boot/$LZMA_INITRAMFS`"
    1.42 -	else
    1.43 -		echo "Initramfs size  : `du -sh $ROOTCD/boot/$INITRAMFS`"
    1.44 -	fi
    1.45 +	echo "Initramfs size  : `du -sh $ROOTCD/boot/$INITRAMFS`"
    1.46  	echo "ISO image size  : `du -sh $ISO_NAME.iso`"
    1.47  	echo "================================================================================"
    1.48  	echo ""
    1.49 @@ -309,8 +298,8 @@
    1.50  		# ISO name.
    1.51  		echo -n "ISO name            : " ; read answer
    1.52  		sed -i s#'ISO_NAME=\"\"'#"ISO_NAME=\"$answer\""# tazlito.conf
    1.53 -		# Volum name.
    1.54 -		echo -n "Volum name          : " ; read answer
    1.55 +		# Volume name.
    1.56 +		echo -n "Volume name         : " ; read answer
    1.57  		sed -i s/'VOLUM_NAME=\"SliTaz\"'/"VOLUM_NAME=\"$answer\""/ tazlito.conf
    1.58  		# Packages repository.
    1.59  		echo -n "Packages repository : " ; read answer
    1.60 @@ -389,7 +378,7 @@
    1.61  		cd $TARGET/rootfs
    1.62  		echo -n "Extracting the rootfs... "
    1.63  		( zcat ../rootcd/boot/rootfs.gz 2>/dev/null || \
    1.64 -		  lzma d ../rootcd/boot/rootfs.lz -so ) | cpio -id
    1.65 +		  lzma d ../rootcd/boot/rootfs.?z -so ) | cpio -id
    1.66  		# Umount and remove temp directory and cd to $TARGET to get stats.
    1.67  		umount $TMP_DIR && rm -rf $TMP_DIR
    1.68  		cd ..
    1.69 @@ -544,7 +533,6 @@
    1.70  			if [ -d "$ROOTFS" ] ; then
    1.71  				echo -n "Removing the rootfs..."
    1.72  				rm -f $DISTRO/$INITRAMFS
    1.73 -				rm -f $DISTRO/$LZMA_INITRAMFS
    1.74  				rm -rf $ROOTFS
    1.75  				status
    1.76  			fi