# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1336024314 -7200
# Node ID 9ba57c7ee2b2058e2a5b6c5e5d21aab90f89face
# Parent  0cc08b00127f53d7c64d8aa0182ac12ba056feef
slitaz-tools: temp patch to tazinst removed

diff -r 0cc08b00127f -r 9ba57c7ee2b2 slitaz-tools/receipt
--- a/slitaz-tools/receipt	Thu May 03 01:32:48 2012 +0200
+++ b/slitaz-tools/receipt	Thu May 03 07:51:54 2012 +0200
@@ -22,9 +22,6 @@
 compile_rules()
 {
     cd $src
-	# temp tazinst patch (until next release)
-	# Must stay in stable since tools <5.0 are not compaible 4.0.
-	#patch -p1 < $stuff/tazinst.patch || return 1
     make && make DESTDIR=$DESTDIR install
 }
 
diff -r 0cc08b00127f -r 9ba57c7ee2b2 slitaz-tools/stuff/tazinst.patch
--- a/slitaz-tools/stuff/tazinst.patch	Thu May 03 01:32:48 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,110 +0,0 @@
---- slitaz-tools-4.9.1/installer/tazinst
-+++ /usr/sbin/tazinst
-@@ -20,7 +20,7 @@
- # 7: Another instance is running
- # 8: Internal error
- 
--VERSION=3.32
-+VERSION=3.34
- 
- # Internationalization
- . /usr/bin/gettext.sh
-@@ -115,6 +115,7 @@
- gen_setup()
- {
- 	SETUP=$1
-+	[ -z "$1" ] && abort 1 "Missing <file> parameter for install configuration"
- 	touch $SETUP || abort 2 $(gettext "Can't write setup file")
- 	if [ -r "$SETUP" ]; then
- 		cat > $SETUP << _EOF_
-@@ -172,7 +173,7 @@
- TGT_WINBOOT=""
- 
- _EOF_
--
-+		echo "$(ls $1)" $(gettext "created")
- 	else
- 		abort 2 $(gettext "Setup file not found")
- 	fi
-@@ -339,10 +340,10 @@
- 		btrfs|ext2|ext3|ext4|fat16|fat32|hfs|hfs+|jfs|ntfs|reiser4|reiserfs|ufs|xfs)
- 			found=no
- 			for xdir in /sbin /usr/sbin /usr/bin; do
--				[ -x "$xdir/mkfs.$TGT_FS" ] && found=yes
-+				[ -x "$xdir/mkfs.$TGT_HOME_FS" ] && found=yes
- 			done
- 			if [ "$found" == "no" ]; then
--				msg "$TGT_FS: mkfs.$TGT_FS $(gettext "is not installed")"; error=yes
-+				msg "$TGT_FS: mkfs.$TGT_HOME_FS $(gettext "is not installed")"; error=yes
- 			fi ;;
- 		*) msg "$TGT_HOME_FS: $(gettext "Unknown filesystem (/home)")"; error=yes ;;
- 	esac
-@@ -774,20 +775,39 @@
- 	debug "Searching for Windows"
- 	if [ "$TGT_WINBOOT" == "auto" ];then
- 		WINBOOT=$(fdisk -l | awk '
--BEGIN{disk=-1,	found=-1,	winboot=""}
-+BEGIN{
-+	disk=-1
-+	found=0 
-+	winboot=""}
- {
--	# Counting disk
--	if ($1=="Disk"){disk++, part=-1}
--	# Counting partition
--	if (substr($1,1,4)=="/dev"){part++}
--	# Read partition Id
-- 	if ($2=="*"){Id=$6}	else {Id=$5}
--	# Detect Windows type
--	if (Id=="7" || Id=="b"){
--		if (found){
--			# record 1st Windows partition found
--			winboot=sprintf("hd%d,%d",disk,part),found++}
-+	# Count disks
-+	if ($1=="Disk"){
-+		disk++
-+		part=-1
-+		dev=substr($2,6,3)
-+		# get removable status
-+		file="/sys/block/"dev"/removable"
-+		"cat " file | getline removable
-+		close("cat ")
-+}
-+	# Count partitions
-+	if (substr($1,1,4)=="/dev"){
-+		# List fixed drives only
-+		if (removable==0){
-+			part++
-+			# Read partition Id
-+	 		if ($2=="*"){Id=$6} else {Id=""}
-+			# Detect Windows Partition Type: 7,b,c,e,f
-+			WPT="[7bcef]"
-+			if (Id ~ WPT){
-+				found++
-+				# record 1st Windows partition found
-+				if (found==1){
-+					winboot=sprintf("hd%d,%d",disk,part)
-+				}
-+			}
- 		}
-+	}
- }
- END{printf "%s", winboot}')
- 		if [ -z "$WINBOOT" ]; then
-@@ -1201,6 +1221,7 @@
- 	new)
- 		gen_setup $2 ;;
- 	showurl)
-+		LOG="/dev/null"
- 		case $2 in
- 			stable)
- 				echo $URL_STABLE ;;
-@@ -1208,6 +1229,8 @@
- 				echo $URL_COOKING ;;
- 			rolling)
- 				echo $URL_ROLLING ;;
-+			*)
-+				abort 1 $(gettext "Unknown url shortcut")
- 		esac ;;
- 	check)
- 		LOG="/dev/null"