# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1203687402 -3600
# Node ID 0f0a3e649fb790e61f96f9c91a933b8d4d95e2e9
# Parent  06813db5603bd6eaeaeae9805d9272ab80406406
Slitaz-installer.sh: add slitaz-loram-cdrom support

diff -r 06813db5603b -r 0f0a3e649fb7 tinyutils/slitaz-installer.sh
--- a/tinyutils/slitaz-installer.sh	Thu Feb 21 20:30:22 2008 +0100
+++ b/tinyutils/slitaz-installer.sh	Fri Feb 22 14:36:42 2008 +0100
@@ -174,21 +174,30 @@
 	cd $TARGET_ROOT
 	( zcat rootfs.gz 2>/dev/null || lzma d rootfs.gz -so 2>/dev/null || \
 	  cat rootfs.gz ) | cpio -id
-	if [ -f .usr.sqfs ]; then
+	# remove link to cdrom
+	[ -d cdrom ] && rmdir cdrom
+	if [ -L usr ]; then
+		rm usr
+		mv ../rootcd/usr .
+	fi
+	# unpack /usr
+	$sqfs="../rootcd/usr.sqfs"
+	[ -f $sqfs ] || sqfs=".usr.sqfs"
+	if [ -f $sqfs ]; then
 		echo -en "\nDécompression de /usr... "
-		sbin/unsquashfs .usr.sqfs
-		rm .usr.sqfs
-		if [ -d squashfs-root/.moved ]; then
-			( cd squashfs-root/.moved ; find * -print ) | \
-			while read file; do
-				[ -L "$file" ] || continue
-				rm -f "$file"
-				mv "squashfs-root/.moved/$file" "$file"
-			done
-			rm -rf squashfs-root/.moved
-		fi
-		mv squashfs-root/* usr
-		rmdir squashfs-root
+		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... "
+		( cd usr/.moved ; find * -print ) | \
+		while read file; do
+			[ -L "$file" ] || continue
+			rm -f "$file"
+			mv "usr/.moved/$file" "$file"
+		done
+		rm -rf usr/.moved
 	fi
 	echo ""
 	echo -n "Suppression des fichiers copiés..."