SliTaz Repositories

     1.1 --- a/tazusb	Mon Feb 20 01:33:07 2012 +0100
     1.2 +++ b/tazusb	Mon Feb 20 01:33:51 2012 +0100
     1.3 @@ -5,7 +5,7 @@
     1.4  # bootable media and/or USB /home partition, such as flash keys, SD card or 
     1.5  # USB harddisk. Authors : see AUTHORS
     1.6  #
     1.7 -VERSION=3.0.1
     1.8 +VERSION=3.0.2
     1.9  
    1.10  # Include gettext helper script.
    1.11  . /usr/bin/gettext.sh
    1.12 @@ -265,9 +265,9 @@
    1.13           OPTIONS=""
    1.14      fi
    1.15  	
    1.16 -	gettext "Mounting"
    1.17 +	gettext "Mounting "
    1.18  	echo  "`basename $ISO`..."; echo ""
    1.19 -	mount $OPTIONS $ISO /media/cdrom 2>/dev/null
    1.20 +	mount $OPTIONS $ISO /media/cdrom 2>/dev/null 
    1.21  	
    1.22  	if [ ! -f /media/cdrom/boot/rootfs.gz -a \
    1.23  	     ! -f /media/cdrom/boot/rootfs1.gz ]; then
    1.24 @@ -282,14 +282,15 @@
    1.25  	gettext "Copying needed files from cdrom..."
    1.26  	mkdir -p $TARGET_ROOT/boot
    1.27  	cp /media/cdrom/boot/bzImage $TARGET_ROOT/boot
    1.28 -	rem=0
    1.29 -	for i in $(ls /media/cdrom/boot/rootfs*.gz | sort -r); do
    1.30 -		[ $rem -ne 0 ] && 
    1.31 -			dd if=/dev/zero bs=1 count=$((4 - $rem)) 2> /dev/null
    1.32 -		cat $i
    1.33 -		rem=$(stat -c %s $i)
    1.34 -		rem=$(($rem % 4))
    1.35 -	done > $TARGET_ROOT/boot/rootfs.gz
    1.36 +	cp /media/cdrom/boot/rootfs*.gz $TARGET_ROOT/boot
    1.37 +	#rem=0
    1.38 +	#~ for i in $(ls /media/cdrom/boot/rootfs*.gz | sort -r); do
    1.39 +		#~ [ $rem -ne 0 ] && 
    1.40 +			#~ dd if=/dev/zero bs=1 count=$((4 - $rem)) 2> /dev/null
    1.41 +		#~ cat $i
    1.42 +		#~ rem=$(stat -c %s $i)
    1.43 +		#~ rem=$(($rem % 4))
    1.44 +	#~ done > $TARGET_ROOT/boot/rootfs.gz
    1.45  	status
    1.46  }
    1.47  
    1.48 @@ -336,9 +337,13 @@
    1.49  	sed -i -e "s/\(append.*\)/\1 home=$UUID/" $(grep -l append $TARGET_ROOT/boot/$ST/*)
    1.50  	
    1.51  	# Splash screen and help files.
    1.52 -	cp /media/cdrom/boot/isolinux/isolinux.msg $TARGET_ROOT/boot/$ST/$ST.msg
    1.53 -	sed -i s/'SliTaz GNU\/Linux'/'SliTaz GNU\/Linux LiveUSB'/ $TARGET_ROOT/boot/$ST/$ST.msg
    1.54 -	cp /media/cdrom/boot/isolinux/splash.lss $TARGET_ROOT/boot/$ST
    1.55 +	if [ -f /media/cdrom/boot/isolinux/isolinux.msg ]; then
    1.56 +		cp /media/cdrom/boot/isolinux/isolinux.msg $TARGET_ROOT/boot/$ST/$ST.msg
    1.57 +		sed -i s/'SliTaz GNU\/Linux'/'SliTaz GNU\/Linux LiveUSB'/ $TARGET_ROOT/boot/$ST/$ST.msg
    1.58 +	fi
    1.59 +	if [ -f /media/cdrom/boot/isolinux/splash.lss ]; then
    1.60 +		cp /media/cdrom/boot/isolinux/splash.lss $TARGET_ROOT/boot/$ST
    1.61 +	fi
    1.62  	cp /media/cdrom/boot/isolinux/*.txt $TARGET_ROOT/boot/$ST
    1.63  	cp /media/cdrom/boot/isolinux/*.cfg $TARGET_ROOT/boot/$ST
    1.64  	cp /media/cdrom/boot/isolinux/*.kbd $TARGET_ROOT/boot/$ST
    1.65 @@ -358,8 +363,10 @@
    1.66  	# Un-meta-ize a multi-in-one flavor
    1.67  	if grep -qs "label slitaz" $TARGET_ROOT/boot/$ST/common.cfg ; then
    1.68  		sed -i "s/isolinux/$ST/;s/label slitaz/label multi/" 	 $TARGET_ROOT/boot/$ST/common.cfg
    1.69 -		sed -i 's/\(.*\), flavors.*/                 \1/' \
    1.70 -			$TARGET_ROOT/boot/$ST/$ST.msg
    1.71 +		if [ -f "$TARGET_ROOT/boot/$ST/$ST.msg" ]; then
    1.72 +			sed -i 's/\(.*\), flavors.*/                 \1/' \
    1.73 +				$TARGET_ROOT/boot/$ST/$ST.msg
    1.74 +		fi
    1.75  		for i in $TARGET_ROOT/boot/$ST/$ST.$STE \
    1.76  			 $TARGET_ROOT/boot/$ST/??.$STE \
    1.77  			 $TARGET_ROOT/boot/$ST/??_??.$STE; do