# HG changeset patch # User Pascal Bellard # Date 1431201255 -7200 # Node ID ad704793e0bf895a365ff8b44b66be60b4998093 # Parent 3942f06994e2babfc17f9e13c6e87d5f3baf61c5 syslinux/taziso: add burn diff -r 3942f06994e2 -r ad704793e0bf cups/stuff/var/www/tazpanel/menu.d/hardware/cups --- a/cups/stuff/var/www/tazpanel/menu.d/hardware/cups Fri May 08 19:30:55 2015 +0200 +++ b/cups/stuff/var/www/tazpanel/menu.d/hardware/cups Sat May 09 21:54:15 2015 +0200 @@ -1,3 +1,3 @@ cat <CUPS +
  • $(_ "Printer") (CUPS)
    • EOT diff -r 3942f06994e2 -r ad704793e0bf ppp/stuff/ppp.cgi --- a/ppp/stuff/ppp.cgi Fri May 08 19:30:55 2015 +0200 +++ b/ppp/stuff/ppp.cgi Sat May 09 21:54:15 2015 +0200 @@ -324,7 +324,7 @@ $(_ 'Remote PPP options') - + $(_ 'Peer routes') diff -r 3942f06994e2 -r ad704793e0bf syslinux/stuff/iso2exe/init --- a/syslinux/stuff/iso2exe/init Fri May 08 19:30:55 2015 +0200 +++ b/syslinux/stuff/iso2exe/init Sat May 09 21:54:15 2015 +0200 @@ -655,6 +655,29 @@ echo -en "\"$1\" \"$2\"" } +burnable() +{ + [ "$(sed '/Can wr.*1$/!d' /proc/sys/dev/cdrom/info)" ] && + [ "$(which wodim)" ] && echo -en "\"$1\" \"$2\"" +} + +blankable() +{ + [ "$(sed '/Can wr.*RW.*1$/!d' /proc/sys/dev/cdrom/info)" ] && + [ "$(which wodim)" ] && echo -en "\"$1\" \"$2\"" +} + +burniso() +{ + wodim -v speed=$(fgrep "drive speed" /proc/sys/dev/cdrom/info | cut -f3) \ + -eject -multi "$ISO" +} + +blankcd() +{ + wodim -v -blank=fast +} + gotisomd5() { [ "$(which md5sum 2> /dev/null)" ] && @@ -968,6 +991,8 @@ $(gotisomd5 "isomd5" "Check the ISO image") \ $(cdfile "md5sum*" "md5" "Check the ISO files") \ $(cdfile "sha*sum*" "sha" "Check the ISO files") \ +$(burnable "burniso" "Burn the ISO image") \ +$(blankable "blankcd" "Blank the CD/DVD") \ $(gotposixovl "install" "Hard disk installation (UMSDOS way)") \ $(gotposixovl "installtaz" "Hard disk installation (TAZUSB way)") \ $(xfile tazusb "usbkey" "USB key read/write installation") \ diff -r 3942f06994e2 -r ad704793e0bf syslinux/stuff/iso2exe/taziso --- a/syslinux/stuff/iso2exe/taziso Fri May 08 19:30:55 2015 +0200 +++ b/syslinux/stuff/iso2exe/taziso Sat May 09 21:54:15 2015 +0200 @@ -32,15 +32,15 @@ gettazboot() { echo "Creating $(basename $1) ..." - if [ $(get 0 $ISO) -eq 23117 ]; then - O=$(($(get 64 $ISO) - 0xC0)) - L=$(($(get 20 $ISO) - 0xC0 - $(get 24 $ISO) - $O)) + if [ $(get 0 "$ISO") -eq 23117 ]; then + O=$(($(get 64 "$ISO") - 0xC0)) + L=$(($(get 20 "$ISO") - 0xC0 - $(get 24 "$ISO") - $O)) S=$((32+$L)) P=$((($S+511)/512)) E=$((4096-(32*$P))) words2bin 0x5A4D $(($S%512)) $P 0 2 $E -1 $((${2:-0}-16)) \ -2 0 256 -16 28 0x6C53 0x5469 0x7A61 > $1 - ddq bs=1 count=$L skip=$(echo $O) if=$ISO >> $1 + ddq bs=1 count=$L skip=$(echo $O) if="$ISO" >> $1 else wget -O $1 http://mirror.slitaz.org/boot/tazboot.exe fi @@ -462,10 +462,10 @@ See http://diddy.boot-land.net/grub4dos/files/README_GRUB4DOS.txt EOT - ( cd $mnt ; zip -r9 $(basename $ISO .iso).zip slitaz ) + ( cd $mnt ; zip -r9 $(basename "$ISO" .iso).zip slitaz ) [ "$(which advzip)" ] && advzip -z4 $mnt/*.zip mv $mnt/*.zip . - ls -l $PWD/$(basename $ISO .iso).zip + ls -l $PWD/$(basename "$ISO" .iso).zip umount $mnt rm -rf $mnt } @@ -791,7 +791,7 @@ misspkg() { - for i in zip kexec-tools posixovl ; do + for i in zip kexec-tools posixovl cdrkit ; do [ -d /var/lib/tazpkg/installed/$i/ ] && continue [ "$1" != "install" ] && menuitem "$@" && return tazpkg get-install $i @@ -805,38 +805,59 @@ ishybrid() { - [ $(get 510 $ISO) -eq 43605 ] || return - C=$((2048*$(get $(((17*2048) + 71)) $ISO 4))) - [ $(get $C $ISO 4) -eq 1 ] || return - [ $(get $(($C+30)) $ISO 4) -eq $((0x88AA55)) ] || return - C=$((2048*$(get $(($C+40)) $ISO 4))) - [ $(get $(($C+64)) $ISO 4) -eq 1886961915 ] && menuitem "$@" + [ $(get 510 "$ISO") -eq 43605 ] || return + C=$((2048*$(get $(((17*2048) + 71)) "$ISO" 4))) + [ $(get $C "$ISO" 4) -eq 1 ] || return + [ $(get $(($C+30)) "$ISO" 4) -eq $((0x88AA55)) ] || return + C=$((2048*$(get $(($C+40)) "$ISO" 4))) + [ $(get $(($C+64)) "$ISO" 4) -eq 1886961915 ] && menuitem "$@" } isiso() { - [ $(get 32769 $ISO 4) -eq 808469571 ] && menuitem "$@" + [ $(get 32769 "$ISO" 4) -eq 808469571 ] && menuitem "$@" +} + +burnable() +{ + [ "$(sed '/Can wr.*1$/!d' /proc/sys/dev/cdrom/info)" ] && menuitem "$@" +} + +blankable() +{ + [ "$(sed '/Can wr.*RW.*1$/!d' /proc/sys/dev/cdrom/info)" ] && menuitem "$@" +} + +burniso() +{ + wodim -v speed=$(fgrep "drive speed" /proc/sys/dev/cdrom/info | cut -f3) \ + -eject -multi "$ISO" +} + +blankcd() +{ + wodim -v -blank=fast } gotisomd5() { [ "$(which md5sum 2> /dev/null)" ] && - [ $(get 0 $ISO) -eq 23117 ] && - [ $(get 18 $ISO) -ne 0 ] && menuitem "$@" + [ $(get 0 "$ISO") -eq 23117 ] && + [ $(get 18 "$ISO") -ne 0 ] && menuitem "$@" } isomd5() { dotwait "Checking iso image" - [ "$(ddq if=$ISO bs=2k skip=16 \ - count=$(echo $(get 32848 $ISO 4)) | md5sum)" == \ - "$(ddq if=$ISO bs=16 count=1 skip=2047 | od -N 16 -t x1 -An | \ + [ "$(ddq if="$ISO" bs=2k skip=16 \ + count=$(echo $(get 32848 "$ISO" 4)) | md5sum)" == \ + "$(ddq if="$ISO" bs=16 count=1 skip=2047 | od -N 16 -t x1 -An | \ sed 's/ //g') -" ] && echo "OK" || echo "ERROR" echo -en "\rChecking iso hybrid boot..." - n=$(($(get 2 $ISO)-1+($(get 4 $ISO)-1)*512)) + n=$(($(get 2 "$ISO")-1+($(get 4 "$ISO")-1)*512)) if [ $n -lt 40000 -a $n -gt 32768 ]; then - s=$(get 0 $ISO 2 $n | awk '{ i+= $0 } END { print i }') - [ $(((1+$s+$(get $(($n+1)) $ISO 1)) % 65536)) -eq 0 ] && + s=$(get 0 "$ISO" 2 $n | awk '{ i+= $0 } END { print i }') + [ $(((1+$s+$(get $(($n+1)) "$ISO" 1)) % 65536)) -eq 0 ] && echo "OK" || echo "ERROR" fi rm -f /tmp/wait @@ -900,8 +921,8 @@ usbdev || return # perform dd in progress bar - max=$(($(stat -c %s $ISO)/2048)) - i=0; ddq if=$ISO bs=1024k | ( + max=$(($(stat -c %s "$ISO")/2048)) + i=0; ddq if="$ISO" bs=1024k | ( while ddq bs=1024k count=1 ; do i=$(($i + 1)) [ $i -gt $max ] && break @@ -971,7 +992,7 @@ exec 3>&- [ $retval -eq 0 ] || return [ "$format" != "none" ] && tazusb format $device "SliTaz" $format - tazusb gen-iso2usb $ISO $device + tazusb gen-iso2usb "$ISO" $device } dokexec() @@ -993,8 +1014,8 @@ flavdata() { - [ $(get 512 $ISO) -eq 35615 ] && n=1 || n=$((1+$(get 417 $ISO 1))) - dd if=$ISO bs=512 skip=$n count=20 2>/dev/null | zcat 2>/dev/null + [ $(get 512 "$ISO") -eq 35615 ] && n=1 || n=$((1+$(get 417 "$ISO" 1))) + dd if="$ISO" bs=512 skip=$n count=20 2>/dev/null | zcat 2>/dev/null } hasflavinfo() @@ -1029,9 +1050,9 @@ exit } -ISO="$1" +ISO="${1:-/dev/null}" [ -z "$(isiso 2> /dev/null)" ] && echo "Usage : $0 file.iso" && exit 1 -mount -o loop,ro $ISO /media/cdrom +mount -o loop,ro "$ISO" /media/cdrom if [ "$2" == "list" ]; then sed '/^\$(.*") \\/!d;s/^\$(\(.*\)").*/\1"/' $0 | while read line; do @@ -1061,6 +1082,8 @@ $(cdfile 'md5sum*' "md5" "Check the ISO files") \ $(cdfile 'sha*sum*' "sha" "Check the ISO files") \ $(cdfilex boot/bzImage "bootiso" "Boot the ISO image") \ +$(burnable "burniso" "Burn the ISO image") \ +$(blankable "blankcd" "Blank the CD/DVD") \ $(gotposixovl "install" "Hard disk installation (UMSDOS way)") \ $(gotposixovl "installtaz" "Hard disk installation (TAZUSB way)") \ $(gotposixovlzip "inst2zip" "ZIP installation archive (UMSDOS way)") \