SliTaz Repositories

     1.1 --- a/installer/slitaz-installer	Sat Mar 27 20:26:06 2010 +0100
     1.2 +++ b/installer/slitaz-installer	Sun Mar 28 15:29:38 2010 +0200
     1.3 @@ -140,7 +140,8 @@
     1.4  		--backtitle "$BACKLIST" \
     1.5  		--gauge "Preparing the installation media..." 18 70 0
     1.6  	# Exit with error msg if no rootfs.gz found.
     1.7 -	if [ ! -f /media/cdrom/boot/rootfs.gz ]; then
     1.8 +	if [ ! -f /media/cdrom/boot/rootfs.gz -a \
     1.9 +	     ! -f /media/cdrom/boot/rootfs1.gz ]; then
    1.10  		ERROR_MSG="$MOUNT_CDROM_ERROR_MSG"
    1.11  		error_message
    1.12  		echo "missing: /media/cdrom/boot/rootfs.gz" >>$LOG
    1.13 @@ -473,9 +474,10 @@
    1.14  extract_rootfs()
    1.15  {
    1.16  	cd $TARGET_ROOT
    1.17 -	(zcat rootfs.gz 2>/dev/null || lzma d rootfs.gz -so || \
    1.18 -	 cat rootfs.gz) 2>>$LOG | cpio -id 2>>$LOG > /dev/null
    1.19 -	rm -f rootfs.gz
    1.20 +	for i in $(ls $1/rootfs* | sort -r); do
    1.21 +		( zcat $i 2>/dev/null || lzma d $i -so || \
    1.22 +		  cat $i ) 2>>$LOG | cpio -id
    1.23 +	done 2>>$LOG > /dev/null
    1.24  	# unpack /usr (double check...)
    1.25  	if ls etc/tazlito | grep -q ".extract"; then
    1.26  		for i in etc/tazlito/*.extract; do
    1.27 @@ -621,16 +623,10 @@
    1.28  	echo "XXX"
    1.29  	copy_bootloaders
    1.30  
    1.31 -	echo "XXX" && echo 40
    1.32 -	echo -e "\nCopying the compressed system (rootfs.gz)..."
    1.33 -	echo "XXX"
    1.34 -	cp /media/cdrom/boot/rootfs.gz $TARGET_ROOT
    1.35 -	sleep 2
    1.36 -
    1.37  	echo "XXX" && echo 50
    1.38  	echo -e "\nExtracting the root system..."
    1.39  	echo "XXX"
    1.40 -	extract_rootfs
    1.41 +	extract_rootfs /media/cdrom/boot
    1.42  
    1.43  	echo "XXX" && echo 60
    1.44  	echo -e "\nPreconfiguring the system..."
    1.45 @@ -881,16 +877,10 @@
    1.46  	echo "XXX"
    1.47  	copy_bootloaders
    1.48  
    1.49 -	echo "XXX" && echo 35
    1.50 -	echo -e "\nCopying the compressed system (rootfs.gz)..."
    1.51 -	echo "XXX"
    1.52 -	cp /media/cdrom/boot/rootfs.gz $TARGET_ROOT
    1.53 -	sleep 2
    1.54 -
    1.55  	echo "XXX" && echo 40
    1.56  	echo -e "\nExtracting the root system..."
    1.57  	echo "XXX"
    1.58 -	extract_rootfs
    1.59 +	extract_rootfs /media/cdrom/boot
    1.60  
    1.61  	# Restore backups.
    1.62  	echo "XXX" && echo 42