SliTaz Repositories

     1.1 --- a/tazlito	Sun Feb 10 09:35:29 2013 +0100
     1.2 +++ b/tazlito	Sat Feb 16 20:22:18 2013 +0100
     1.3 @@ -332,7 +332,7 @@
     1.4  {
     1.5  	local size
     1.6  	size=$(stat -c %s ${1:-/dev/null})
     1.7 -	[ $(($size & 3)) -ne 0 ] &&
     1.8 +	[ $((${size:-0} & 3)) -ne 0 ] &&
     1.9  	dd if=/dev/zero bs=1 count=$((4 - ($size & 3))) >> $1 2> /dev/null
    1.10  }
    1.11  
    1.12 @@ -773,6 +773,7 @@
    1.13  	mkdir -p $TMP_DIR/initfs/bin $TMP_DIR/initfs/dev $TMP_DIR/initfs/run \
    1.14  		 $TMP_DIR/initfs/mnt $TMP_DIR/initfs/proc $TMP_DIR/initfs/tmp \
    1.15  		 $TMP_DIR/initfs/sys $TMP_DIR/initfs/lib/modules
    1.16 +	ln -s bin $TMP_DIR/initfs/sbin
    1.17  	while [ ! -f /lib/modules/$version/kernel/fs/aufs/aufs.ko.?z ]; do
    1.18  		install_package aufs $version || return 1
    1.19  	done
    1.20 @@ -790,12 +791,10 @@
    1.21  	cp /lib/modules/$version/kernel/fs/squashfs/squashfs.ko.?z \
    1.22  		 $TMP_DIR/initfs/lib/modules
    1.23  	ls /sbin/unsquashfs /usr/lib/liblzma.so* $INSTALLED/squashfs/* | \
    1.24 -		cpio -o -H newc > $TMP_DIR/initfs/extractfs.cpio
    1.25 -	if [ "$1" == "cdrom" ]; then
    1.26 -		for i in $(ls /dev/[hs]d[a-f]*); do
    1.27 -			cp -a $i $TMP_DIR/initfs/dev
    1.28 -		done
    1.29 -	fi
    1.30 +	cpio -o -H newc > $TMP_DIR/initfs/extractfs.cpio
    1.31 +	for i in $(ls /dev/[hs]d[a-f]*); do
    1.32 +		cp -a $i $TMP_DIR/initfs/dev
    1.33 +	done
    1.34  	if [ "$1" == "http" ]; then
    1.35  		mkdir $TMP_DIR/initfs/etc
    1.36  		ln -s /proc/mounts $TMP_DIR/initfs/etc/mtab
    1.37 @@ -992,6 +991,10 @@
    1.38  [ -x /mnt/sbin/init ] && exec /bin/switch_root mnt /sbin/init || sh
    1.39  EOTEOT
    1.40  	chmod +x $TMP_DIR/initfs/init
    1.41 +	for i in $TMP_DIR/initfs/lib/modules/*z ; do
    1.42 +		unxz $i || gunzip $i || lzma d $i ${i%.gz}
    1.43 +		rm -f $i
    1.44 +	done 2> /dev/null
    1.45  	( cd $TMP_DIR/initfs ; find | busybox cpio -o -H newc 2> /dev/null) | \
    1.46  	lzma e $TMP_DIR/initfs.gz -si
    1.47  	lzma_set_size $TMP_DIR/initfs.gz
    1.48 @@ -1127,6 +1130,8 @@
    1.49  		done
    1.50  		sed -i -e "/append [0-9]/s/append .*/append$new $1/" -e \
    1.51  			"/append ifmem [0-9]/s/append .*/append ifmem$new $1/" $cfg
    1.52 +		sed -i 's|\(initrd=\)\(/boot/rootfs.\.gz\)|\1/boot/rootfs.gz,\2|' $cfg
    1.53 +		sed -i '/LABEL base/{NNNNp;s|base .ive|cdrom|;s|base|cdrom|;s|,[^ ]*||}' $cfg
    1.54  	done
    1.55  }
    1.56