tazlito rev 182

tazlito: use flavor name as boot label with meta flaovrs
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Apr 30 11:43:32 2010 +0200 (2010-04-30)
parents a47ff98afc58
children c7cb09008f4b
files tazlito
line diff
     1.1 --- a/tazlito	Thu Apr 22 12:45:34 2010 +0200
     1.2 +++ b/tazlito	Fri Apr 30 11:43:32 2010 +0200
     1.3 @@ -599,6 +599,12 @@
     1.4  F5 enhelp.txt
     1.5  F6 enopts.txt
     1.6  EOT
     1.7 +	# Restore real label names
     1.8 +	echo $2 | awk '{ for (i=NF; i>1; i-=2) printf "%d/%s\n",i/2,$i }' | \
     1.9 +	while read pat; do
    1.10 +		sed -i "s/slitaz$pat/" $1/common.cfg \
    1.11 +			$(grep -l 'include common' $1/*.cfg)
    1.12 +	done
    1.13  	status
    1.14  }
    1.15  
    1.16 @@ -687,7 +693,7 @@
    1.17  			cpio -idmu etc/slitaz-release > /dev/null
    1.18  		done
    1.19  		cd - > /dev/null
    1.20 -		echo "Default urls for /iso/$(cat $TMP_DIR/initfs/etc/slitaz-release)/flavors/slitaz-loram-cdrom.iso: $urliso"
    1.21 +		echo "Default urls for /iso/$(cat $TMP_DIR/initfs/etc/slitaz-release)/flavors/slitaz-loram-cdrom.iso /iso/$(cat $TMP_DIR/initfs/etc/slitaz-release)/flavors/slitaz-$(cat $TMP_DIR/initfs/etc/slitaz-release)-loram-cdrom.iso: $urliso"
    1.22  		echo -n "List of urls to insert: "
    1.23  		read -t 30 urliso2
    1.24  		urliso="$urliso2 $urliso"
    1.25 @@ -762,7 +768,7 @@
    1.26  fi
    1.27  for i in $urliso ; do
    1.28  	[ -n "\$URLISO" ] && URLISO="\$URLISO,"
    1.29 -	URLISO="\${URLISO}http://\$i/iso/\$(cat /etc/slitaz-release)/flavors/slitaz-loram-cdrom.iso"
    1.30 +	URLISO="\${URLISO}http://\$i/iso/\$(cat /etc/slitaz-release)/flavors/slitaz-loram-cdrom.iso,http://\$i/iso/\$(cat /etc/slitaz-release)/flavors/slitaz-\$(cat /etc/slitaz-release)-loram-cdrom.iso"
    1.31  done
    1.32  getarg urliso URLISO
    1.33  DIR=fs