wok diff syslinux/stuff/iso2exe/taziso @ rev 19838
syslinux/iso2exe: fix hybrid mbr read
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Mar 12 09:47:07 2017 +0100 (2017-03-12) |
parents | 2547fda51451 |
children | a686b7799fe9 |
line diff
1.1 --- a/syslinux/stuff/iso2exe/taziso Wed Oct 19 19:17:20 2016 +0100 1.2 +++ b/syslinux/stuff/iso2exe/taziso Sun Mar 12 09:47:07 2017 +0100 1.3 @@ -839,12 +839,14 @@ 1.4 1.5 burnable() 1.6 { 1.7 - [ "$(sed '/Can wr.*1$/!d' /proc/sys/dev/cdrom/info)" ] && menuitem "$@" 1.8 + [ "$(sed '/Can wr.*1$/!d' /proc/sys/dev/cdrom/info 2> /dev/null)" ] && 1.9 + menuitem "$@" 1.10 } 1.11 1.12 blankable() 1.13 { 1.14 - [ "$(sed '/Can wr.*RW.*1$/!d' /proc/sys/dev/cdrom/info)" ] && menuitem "$@" 1.15 + [ "$(sed '/Can wr.*RW.*1$/!d' /proc/sys/dev/cdrom/info 2> /dev/null)" ] && 1.16 + menuitem "$@" 1.17 } 1.18 1.19 burniso() 1.20 @@ -1093,12 +1095,12 @@ 1.21 { 1.22 [ $(get 1024 "$ISO") -eq 35615 ] && n=2 || n=$((1+$(get 417 "$ISO" 1))) 1.23 [ $n -eq 4 ] && n=20 1.24 - dd if="$ISO" bs=512 skip=$n count=20 2>/dev/null | zcat 2>/dev/null 1.25 + ddq if="$ISO" bs=512 skip=$n count=20 | zcat 2>/dev/null 1.26 } 1.27 1.28 hasflavinfo() 1.29 { 1.30 - [ "$(flavdata | dd bs=1 count=8 2> /dev/null | strings)" == \ 1.31 + [ "$(flavdata | ddq bs=1 count=8 | strings)" == \ 1.32 "07070100" ] && menuitem "$@" 1.33 } 1.34