SliTaz Repositories

     1.1 --- a/installer/slitaz-installer	Thu Mar 06 23:55:02 2008 +0100
     1.2 +++ b/installer/slitaz-installer	Sat Mar 08 01:35:06 2008 +0000
     1.3 @@ -346,6 +346,13 @@
     1.4  		sbin/unsquashfs -d usr $sqfs
     1.5  		[ "$sqfs" = ".usr.sqfs" ] && rm -f $sqfs
     1.6  	fi
     1.7 +	cromfs="/media/cdrom/usr.cromfs"
     1.8 +	[ -f $cromfs ] || cromfs=".usr.cromfs"
     1.9 +	if [ -f $cromfs ]; then
    1.10 +		rmdir usr
    1.11 +		bin/unmkcromfs $cromfs usr
    1.12 +		[ "$cromfs" = ".usr.cromfs" ] && rm -f $cromfs
    1.13 +	fi
    1.14  	if [ -d usr/.moved ]; then
    1.15  		( cd usr/.moved ; find * -print ) | \
    1.16  		while read file; do

     2.1 --- a/tinyutils/slitaz-installer.sh	Thu Mar 06 23:55:02 2008 +0100
     2.2 +++ b/tinyutils/slitaz-installer.sh	Sat Mar 08 01:35:06 2008 +0000
     2.3 @@ -187,7 +187,14 @@
     2.4  		echo -en "\nDécompression de /usr... "
     2.5  		rmdir usr
     2.6  		sbin/unsquashfs -d usr $sqfs
     2.7 -		rm -f $sqfs 2> /dev/null
     2.8 +		[ "$sqfs" = ".usr.sqfs" ] && rm -f $sqfs
     2.9 +	fi
    2.10 +	cromfs="/media/cdrom/usr.cromfs"
    2.11 +	[ -f $cromfs ] || cromfs=".usr.cromfs"
    2.12 +	if [ -f $cromfs ]; then
    2.13 +		rmdir usr
    2.14 +		bin/unmkcromfs $cromfs usr
    2.15 +		[ "$cromfs" = ".usr.cromfs" ] && rm -f $cromfs
    2.16  	fi
    2.17  	if [ -d usr/.moved ]; then
    2.18  		echo -en "\nRestoration des fichiers déplacés dans /usr... "