SliTaz Repositories

     1.1 --- a/tazlito	Sun Feb 19 09:54:48 2012 +0100
     1.2 +++ b/tazlito	Thu Feb 23 15:14:56 2012 +0100
     1.3 @@ -1061,27 +1061,30 @@
     1.4  # Reduce sizes with rootfs gains.
     1.5  update_metaiso_sizes()
     1.6  {
     1.7 -	local append="$(grep append $TMP_DIR/loramiso/boot/isolinux/common.cfg)"
     1.8 -	local new
     1.9 -	[ -n "$append" ] || return
    1.10 -	set -- $append
    1.11 -	shift
    1.12 -	new=""
    1.13 -	while [ -n "$2" ]; do
    1.14 -		local s
    1.15 -		case "$1" in
    1.16 -		*G) s=$(( ${1%G} * 1024 * 1024 ));;
    1.17 -		*M) s=$(( ${1%M} * 1024 ));;
    1.18 -		*)  s=${1%K};;
    1.19 -		esac
    1.20 -		rootfs_sizes=${rootfs_sizes#* }
    1.21 -		for i in $rootfs_sizes ; do
    1.22 -			s=$(( $s - $i ))
    1.23 +	for cfg in $(grep -l 'append [0-9]' $TMP_DIR/loramiso/boot/isolinux/*.cfg)
    1.24 +	do
    1.25 +		local append="$(grep 'append [0-9]' $cfg)"
    1.26 +		local sizes="$rootfs_sizes"
    1.27 +		local new
    1.28 +		set -- $append
    1.29 +		shift
    1.30 +		new=""
    1.31 +		while [ -n "$2" ]; do
    1.32 +			local s
    1.33 +			case "$1" in
    1.34 +			*G) s=$(( ${1%G} * 1024 * 1024 ));;
    1.35 +			*M) s=$(( ${1%M} * 1024 ));;
    1.36 +			*)  s=${1%K};;
    1.37 +			esac
    1.38 +			sizes=${sizes#* }
    1.39 +			for i in $sizes ; do
    1.40 +				s=$(( $s - $i ))
    1.41 +			done
    1.42 +			new="$new $s $2"
    1.43 +			shift 2
    1.44  		done
    1.45 -		new="$new $s $2"
    1.46 -		shift 2
    1.47 +		sed -i "/append [0-9]/s/append .*/append$new $1/" $cfg 
    1.48  	done
    1.49 -	sed -i "s/append .*/append$new $1/" $TMP_DIR/loramiso/boot/isolinux/common.cfg 
    1.50  }
    1.51  
    1.52  # Move rootfs to a squashfs filesystem into the initramfs writeable with aufs.
    1.53 @@ -2454,6 +2457,10 @@
    1.54  
    1.55  		ISO=$2
    1.56  		OUTPUT=$3
    1.57 +		if [ -z "$3" ]; then
    1.58 +			echo "Usage: tazlito $1 input.iso output.iso [cdrom|smallcdrom|http|ram]"
    1.59 +			exit 1
    1.60 +		fi
    1.61  		mkdir -p $TMP_DIR/iso
    1.62  		mount -o loop,ro -t iso9660 $ISO $TMP_DIR/iso
    1.63  		if ! check_iso_for_loram ; then