slitaz-tools rev 63

Slitaz-installer.sh: look for usr.sqfs in /cdrom, not ../rootcd
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Feb 22 15:44:58 2008 +0100 (2008-02-22)
parents 0f0a3e649fb7
children b152d5a5c35a
files tinyutils/slitaz-installer.sh
line diff
     1.1 --- a/tinyutils/slitaz-installer.sh	Fri Feb 22 14:36:42 2008 +0100
     1.2 +++ b/tinyutils/slitaz-installer.sh	Fri Feb 22 15:44:58 2008 +0100
     1.3 @@ -178,16 +178,15 @@
     1.4  	[ -d cdrom ] && rmdir cdrom
     1.5  	if [ -L usr ]; then
     1.6  		rm usr
     1.7 -		mv ../rootcd/usr .
     1.8 +		cp -a /cdrom/usr .
     1.9  	fi
    1.10  	# unpack /usr
    1.11 -	$sqfs="../rootcd/usr.sqfs"
    1.12 +	sqfs="/cdrom/usr.sqfs"
    1.13  	[ -f $sqfs ] || sqfs=".usr.sqfs"
    1.14  	if [ -f $sqfs ]; then
    1.15  		echo -en "\nDécompression de /usr... "
    1.16  		rmdir usr
    1.17  		sbin/unsquashfs -d usr $sqfs
    1.18 -		rm $sqfs
    1.19  	fi
    1.20  	if [ -d usr/.moved ]; then
    1.21  		echo -en "\nRestoration des fichiers déplacés dans /usr... "