# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1451660541 -3600
# Node ID d2513bef62407184eca98cac06cc3c98e36e5e42
# Parent  08fcd2213d740ef27d9b7f3b73d3d9450f6cfc08
syslinux/iso2exe/init: fix 'Show flavor infos'

diff -r 08fcd2213d74 -r d2513bef6240 syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Fri Jan 01 14:04:24 2016 +0100
+++ b/syslinux/stuff/iso2exe/init	Fri Jan 01 16:02:21 2016 +0100
@@ -1153,7 +1153,7 @@
 hasflavinfo()
 {
 	[ "$(flavdata | dd bs=1 count=8 2> /dev/null | strings)" == \
-	  "07070100" ] && echo -en "\"$2\"	\"$3\""
+	  "07070100" ] && echo -en "\"$1\"	\"$2\""
 }
 
 showfavinfo()
@@ -1203,8 +1203,8 @@
 which $DIALOG 2> /dev/null || DIALOG=tinydialog
 dmesg > /tmp/dmesg
 
-isotitle="$(basename $ISO)  $(stat -c %y /media/cdrom | sed 's/ .*//'\
-	  )  $(blkid /mnt/$ISO | sed 's/.*LABEL="\([^"]*\).*/\1/')"
+isotitle="$(blkid /mnt/$ISO | sed 's/.*LABEL="\([^"]*\).*/\1/')  $(stat \
+	 -c %y /media/cdrom | sed 's/ .*//')  $(basename $ISO)"
 while true; do
 	trap shell 2 
 	keymap="$(cat /etc/keymap.conf 2> /dev/null)"
diff -r 08fcd2213d74 -r d2513bef6240 syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Fri Jan 01 14:04:24 2016 +0100
+++ b/syslinux/stuff/iso2exe/taziso	Fri Jan 01 16:02:21 2016 +0100
@@ -1279,8 +1279,8 @@
 
 isotitle()
 {
-	echo "$(basename "$ISO")  $(stat -c %y $media/.|sed 's/ .*//')  $(blkid \
-		"$ISO" | sed 's/.*LABEL="\([^"]*\).*/\1/')"
+	echo "$(blkid "$ISO" | sed 's/.*LABEL="\([^"]*\).*/\1/')  $(stat \
+		-c %y $media/.|sed 's/ .*//')  $(basename "$ISO")"
 }
 
 ISO="${1:-/dev/null}"