wok rev 18778

syslinux/iso2exe/init: fix 'Show flavor infos'
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jan 01 16:02:21 2016 +0100 (2016-01-01)
parents 08fcd2213d74
children 4145d548de53
files syslinux/stuff/iso2exe/init syslinux/stuff/iso2exe/taziso
line diff
     1.1 --- a/syslinux/stuff/iso2exe/init	Fri Jan 01 14:04:24 2016 +0100
     1.2 +++ b/syslinux/stuff/iso2exe/init	Fri Jan 01 16:02:21 2016 +0100
     1.3 @@ -1153,7 +1153,7 @@
     1.4  hasflavinfo()
     1.5  {
     1.6  	[ "$(flavdata | dd bs=1 count=8 2> /dev/null | strings)" == \
     1.7 -	  "07070100" ] && echo -en "\"$2\"	\"$3\""
     1.8 +	  "07070100" ] && echo -en "\"$1\"	\"$2\""
     1.9  }
    1.10  
    1.11  showfavinfo()
    1.12 @@ -1203,8 +1203,8 @@
    1.13  which $DIALOG 2> /dev/null || DIALOG=tinydialog
    1.14  dmesg > /tmp/dmesg
    1.15  
    1.16 -isotitle="$(basename $ISO)  $(stat -c %y /media/cdrom | sed 's/ .*//'\
    1.17 -	  )  $(blkid /mnt/$ISO | sed 's/.*LABEL="\([^"]*\).*/\1/')"
    1.18 +isotitle="$(blkid /mnt/$ISO | sed 's/.*LABEL="\([^"]*\).*/\1/')  $(stat \
    1.19 +	 -c %y /media/cdrom | sed 's/ .*//')  $(basename $ISO)"
    1.20  while true; do
    1.21  	trap shell 2 
    1.22  	keymap="$(cat /etc/keymap.conf 2> /dev/null)"
     2.1 --- a/syslinux/stuff/iso2exe/taziso	Fri Jan 01 14:04:24 2016 +0100
     2.2 +++ b/syslinux/stuff/iso2exe/taziso	Fri Jan 01 16:02:21 2016 +0100
     2.3 @@ -1279,8 +1279,8 @@
     2.4  
     2.5  isotitle()
     2.6  {
     2.7 -	echo "$(basename "$ISO")  $(stat -c %y $media/.|sed 's/ .*//')  $(blkid \
     2.8 -		"$ISO" | sed 's/.*LABEL="\([^"]*\).*/\1/')"
     2.9 +	echo "$(blkid "$ISO" | sed 's/.*LABEL="\([^"]*\).*/\1/')  $(stat \
    2.10 +		-c %y $media/.|sed 's/ .*//')  $(basename "$ISO")"
    2.11  }
    2.12  
    2.13  ISO="${1:-/dev/null}"