tazlito rev 109

Add mirror in flavors
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Sep 01 18:38:45 2009 +0200 (2009-09-01)
parents d2375d0fa398
children c80d5cd9e93c
files tazlito
line diff
     1.1 --- a/tazlito	Sat Aug 22 12:40:28 2009 +0200
     1.2 +++ b/tazlito	Tue Sep 01 18:38:45 2009 +0200
     1.3 @@ -783,6 +783,10 @@
     1.4  			fi
     1.5  		done
     1.6  		[ -s $FLAVOR.nonfree ] && $FILES="$FILES\n$FLAVOR.nonfree"
     1.7 +		for i in $LOCALSTATE/undigest/*/mirror ; do
     1.8 +			[ -s $i ] && cat $i >> $FLAVOR.mirrors
     1.9 +		done
    1.10 +		[ -s $FLAVOR.mirrors ] && $FILES="$FILES\n$FLAVOR.mirrors"
    1.11  		echo -e "$FLAVOR.desc\n$FILES" | cpio -o -H newc 2>/dev/null | \
    1.12  			gzip -9 > $FLAVOR.flavor
    1.13  		rm `echo -e $FILES`
    1.14 @@ -872,6 +876,9 @@
    1.15  				  (cd $FLAVORS_REPOSITORY/$FLAVOR/$i; \
    1.16  				   cpio -idm > /dev/null)
    1.17  			done
    1.18 +			[ -s $TMP_DIR/$FLAVOR.mirrors ] &&
    1.19 +				cp $TMP_DIR/$FLAVOR.mirrors \
    1.20 +					$FLAVORS_REPOSITORY/$FLAVOR/mirrors
    1.21  			[ -s /var/lib/tazpkg/packages.list ] || tazpkg recharge
    1.22  			while read org; do
    1.23  				i=0
    1.24 @@ -895,6 +902,9 @@
    1.25  			mkdir $TMP_DIR
    1.26  			echo -n "Create $FLAVOR..."
    1.27  			[ -s /var/lib/tazpkg/packages.list ] || tazpkg recharge
    1.28 +			[ -s $FLAVORS_REPOSITORY/$FLAVOR/mirrors ] &&
    1.29 +				cp $FLAVORS_REPOSITORY/$FLAVOR/mirrors \
    1.30 +					$TMP_DIR/$FLAVOR.mirrors
    1.31  			packed_size=0; unpacked_size=0
    1.32  			grep -v ^#  $FLAVORS_REPOSITORY/$FLAVOR/packages.list > \
    1.33  				$TMP_DIR/$FLAVOR.pkg
    1.34 @@ -979,11 +989,22 @@
    1.35  			status
    1.36  			for i in rootcd rootfs; do
    1.37  				if [ -f $TMP_DIR/$FLAVOR.$i ]; then
    1.38 +					echo -n "Add $i..."
    1.39  					mkdir -p "$ADDFILES/$i"
    1.40  					zcat $TMP_DIR/$FLAVOR.$i | \
    1.41  						( cd "$ADDFILES/$i"; cpio -id 2> /dev/null)
    1.42 +					status
    1.43  				fi
    1.44  			done
    1.45 +			if [ -s $TMP_DIR/$FLAVOR.mirrors ]; then
    1.46 +				n=""
    1.47 +				while read line; do
    1.48 +					mkdir -p $LOCALSTATE/undigest/$FLAVOR$n
    1.49 +					echo "$line" > $LOCALSTATE/undigest/$FLAVOR$n/mirror
    1.50 +					n=$(( $n + 1 ))
    1.51 +				done < $TMP_DIR/$FLAVOR.mirrors
    1.52 +				tazpkg recharge
    1.53 +			fi
    1.54  			echo -n "Update tazlito.conf..."
    1.55  			[ -f tazlito.conf ] || cp /etc/tazlito/tazlito.conf .
    1.56  			cat tazlito.conf | grep -v "^#VOLUM_NAME" | \