# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1479731482 -3600
# Node ID 6ee45ac02b0574050ae03d078efa1493699fbdc2
# Parent  3f33b4b50b30a5e7574aeb1c8ecae6e1a2790f0d
syslinux/taziso: hide some error messages

diff -r 3f33b4b50b30 -r 6ee45ac02b05 syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Mon Nov 21 09:32:06 2016 +0100
+++ b/syslinux/stuff/iso2exe/init	Mon Nov 21 13:31:22 2016 +0100
@@ -149,10 +149,11 @@
 		if checkmagic /mnt/$ISO; then
 			mount -o loop,ro /mnt/$ISO /media/cdrom
 			echo "Found $ISO on $(basename $dev)"
-			break
+			return 0
 		fi
 		umount /mnt
-	done
+	done 2> /dev/null
+	return 1
 }
 
 uncpio()
@@ -646,7 +647,7 @@
 
 ishybrid()
 {
-	[ $(get 510 $ISO) -eq 43605 ] || return
+	[ $(get 510 $ISO 2> /dev/null || echo 0) -eq 43605 ] || return
 	C=$((2048*$(get $(((17*2048) + 71)) /mnt/$ISO 4)))
 	[ $(get $C /mnt/$ISO 4) -eq 1 ] || return
 	[ $(get $(($C+30)) /mnt/$ISO 4) -eq $((0x88AA55)) ] || return
@@ -657,13 +658,13 @@
 
 burnable()
 {
-	[ "$(sed '/Can wr.*1$/!d' /proc/sys/dev/cdrom/info)" ] &&
+	[ "$(sed '/Can wr.*1$/!d' /proc/sys/dev/cdrom/info 2> /dev/null)" ] &&
 	[ "$(which wodim)" ] && echo -en "\"$1\"	\"$2\""
 }
 
 blankable()
 {
-	[ "$(sed '/Can wr.*RW.*1$/!d' /proc/sys/dev/cdrom/info)" ] &&
+	[ "$(sed '/Can wr.*RW.*1$/!d' /proc/sys/dev/cdrom/info 2> /dev/null)" ] &&
 	[ "$(which wodim)" ] && echo -en "\"$1\"	\"$2\""
 }
 
@@ -1146,14 +1147,14 @@
 
 flavdata()
 {
-	dd if=/mnt/$ISO bs=512 skip=$((1+$(get 417 /mnt/$ISO 1))) \
-		count=20 2>/dev/null | zcat 2>/dev/null
+	ddq if=/mnt/$ISO bs=512 skip=$((1+$(get 417 /mnt/$ISO 1))) \
+		count=20 | zcat 2>/dev/null
 }
 
 hasflavinfo()
 {
-	[ "$(flavdata | dd bs=1 count=8 2> /dev/null | strings)" == \
-	  "07070100" ] && echo -en "\"$1\"	\"$2\""
+	[ "$(flavdata | ddq bs=1 count=8)" == "07070100" ] &&
+	echo -en "\"$1\"	\"$2\""
 }
 
 showfavinfo()
@@ -1200,7 +1201,7 @@
 	mknod $n b $(sed 's/:/ /' < $i)
 done
 ISO="$(getarg bootfrom | sed 's/.://;s|\\|/|g')"
-getiso
+getiso || text 2> /dev/null
 mount_loram
 case "${ISO##*/}$(getarg mode)" in
 *install*|*INSTALL*)	install ;;
diff -r 3f33b4b50b30 -r 6ee45ac02b05 syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Mon Nov 21 09:32:06 2016 +0100
+++ b/syslinux/stuff/iso2exe/taziso	Mon Nov 21 13:31:22 2016 +0100
@@ -839,12 +839,14 @@
 
 burnable()
 {
-	[ "$(sed '/Can wr.*1$/!d' /proc/sys/dev/cdrom/info)" ] && menuitem "$@"
+	[ "$(sed '/Can wr.*1$/!d' /proc/sys/dev/cdrom/info 2> /dev/null)" ] &&
+	menuitem "$@"
 }
 
 blankable()
 {
-	[ "$(sed '/Can wr.*RW.*1$/!d' /proc/sys/dev/cdrom/info)" ] && menuitem "$@"
+	[ "$(sed '/Can wr.*RW.*1$/!d' /proc/sys/dev/cdrom/info 2> /dev/null)" ] &&
+	menuitem "$@"
 }
 
 burniso()
@@ -1093,12 +1095,12 @@
 {
 	[ $(get 1024 "$ISO") -eq 35615 ] && n=2 || n=$((1+$(get 417 "$ISO" 1)))
 	[ $n -eq 4 ] && n=20
-	dd if="$ISO" bs=512 skip=$n count=20 2>/dev/null | zcat 2>/dev/null
+	ddq if="$ISO" bs=512 skip=$n count=20 | zcat 2>/dev/null
 }
 
 hasflavinfo()
 {
-	[ "$(flavdata | dd bs=1 count=8 2> /dev/null | strings)" == \
+	[ "$(flavdata | ddq bs=1 count=8 | strings)" == \
 	  "07070100" ] && menuitem "$@"
 }