slitaz-tools rev 186

slitaz-installer: fix slitaz-loram-cdrom case
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun May 11 15:02:54 2008 +0000 (2008-05-11)
parents 6821317846d5
children dbf2e0b2feb7
files installer/slitaz-installer
line diff
     1.1 --- a/installer/slitaz-installer	Sun May 11 03:17:54 2008 +0200
     1.2 +++ b/installer/slitaz-installer	Sun May 11 15:02:54 2008 +0000
     1.3 @@ -306,12 +306,12 @@
     1.4  {
     1.5  	cd $TARGET_ROOT
     1.6  	(zcat rootfs.gz 2>/dev/null || lzma d rootfs.gz -so || \
     1.7 -	 cat rootfs.gz) 2>>$LOG | cpio -id 2>>$LOG
     1.8 +	 cat rootfs.gz) 2>>$LOG | cpio -id 2>>$LOG > /dev/null
     1.9  	rm -f rootfs.gz
    1.10  	# unpack /usr (double check...)
    1.11  	if ls etc/tazlito | grep -q ".extract"; then
    1.12  		for i in etc/tazlito/*.extract; do
    1.13 -			[ -f "$i" ] && . $i /media/cdrom.
    1.14 +			[ -f "$i" ] && . $i /media/cdrom
    1.15  		done
    1.16  	fi
    1.17  }
    1.18 @@ -519,7 +519,7 @@
    1.19  	echo "XXX"
    1.20  	if mount | grep -q /media/cdrom; then
    1.21  		umount /media/cdrom
    1.22 -		eject
    1.23 +		grep -q slitaz-loram-cdrom /etc/init.d/rcS || eject
    1.24  	fi
    1.25  	sleep 2
    1.26  	echo "XXX" && echo 100