# HG changeset patch # User Pascal Bellard # Date 1203691498 -3600 # Node ID dc013a900d495d0c1183ee68a5cf73e6b7fb568e # Parent 0f0a3e649fb790e61f96f9c91a933b8d4d95e2e9 Slitaz-installer.sh: look for usr.sqfs in /cdrom, not ../rootcd diff -r 0f0a3e649fb7 -r dc013a900d49 tinyutils/slitaz-installer.sh --- a/tinyutils/slitaz-installer.sh Fri Feb 22 14:36:42 2008 +0100 +++ b/tinyutils/slitaz-installer.sh Fri Feb 22 15:44:58 2008 +0100 @@ -178,16 +178,15 @@ [ -d cdrom ] && rmdir cdrom if [ -L usr ]; then rm usr - mv ../rootcd/usr . + cp -a /cdrom/usr . fi # unpack /usr - $sqfs="../rootcd/usr.sqfs" + sqfs="/cdrom/usr.sqfs" [ -f $sqfs ] || sqfs=".usr.sqfs" if [ -f $sqfs ]; then echo -en "\nDécompression de /usr... " rmdir usr sbin/unsquashfs -d usr $sqfs - rm $sqfs fi if [ -d usr/.moved ]; then echo -en "\nRestoration des fichiers déplacés dans /usr... "