tazlito rev 248 4.4

tazlito/writeiso: add meta support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Mar 06 17:25:54 2012 +0100 (2012-03-06)
parents 63403a46cc56
children 5fe519d93436
files tazlito
line diff
     1.1 --- a/tazlito	Tue Mar 06 13:24:22 2012 +0100
     1.2 +++ b/tazlito	Tue Mar 06 17:25:54 2012 +0100
     1.3 @@ -1004,15 +1004,16 @@
     1.4  # because meta loram flavor is useless when rootfs is not loaded in ram
     1.5  unmeta_boot()
     1.6  {
     1.7 -	if [ -f $TMP_DIR/loramiso/boot/isolinux/noram.cfg ]; then
     1.8 +	local root=${1:-$TMP_DIR/loramiso}
     1.9 +	if [ -f $root/boot/isolinux/noram.cfg ]; then
    1.10  		# We keep enough information to do unloram...
    1.11  		sed -i 's/label slitaz/label orgslitaz/' \
    1.12 -			$TMP_DIR/loramiso/boot/isolinux/common.cfg
    1.13 +			$root/boot/isolinux/common.cfg
    1.14  		sed -i '/ifmem/{NNNNNNNNd};s/LABEL SliTaz [^L].*/HIDE/' \
    1.15 -			$TMP_DIR/loramiso/boot/isolinux/isolinux.cfg
    1.16 -		set -- $(grep 'append [0-9]' $TMP_DIR/loramiso/boot/isolinux/common.cfg)
    1.17 +			$root/boot/isolinux/isolinux.cfg
    1.18 +		set -- $(grep 'append [0-9]' $root/boot/isolinux/common.cfg)
    1.19  		sed -i "s/label $3\$/label slitaz/;s|=/boot/rootfs\(.*\).gz |=/boot/rootfs.gz |" \
    1.20 -			$TMP_DIR/loramiso/boot/isolinux/*.cfg
    1.21 +			$root/boot/isolinux/*.cfg
    1.22  	fi
    1.23  }
    1.24  
    1.25 @@ -2271,6 +2272,7 @@
    1.26  		if mount /dev/cdrom /media/cdrom 2>/dev/null; then
    1.27  			cp /media/cdrom/boot/bzImage $ROOTCD/boot
    1.28  			cp -a /media/cdrom/boot/isolinux $ROOTCD/boot
    1.29 +			unmeta_boot $ROOTCD
    1.30  			umount /media/cdrom
    1.31  		else
    1.32  			echo -e "