# HG changeset patch # User Paul Issott # Date 1355422920 0 # Node ID 87a217af01eaba58a54eaf44608622184f67b621 # Parent 7d300004a3b8e234416e611b55690985b1f2f23c syslinux: iso2exe (tiny edits) diff -r 7d300004a3b8 -r 87a217af01ea syslinux/stuff/iso2exe/README --- a/syslinux/stuff/iso2exe/README Thu Dec 13 14:33:27 2012 +0100 +++ b/syslinux/stuff/iso2exe/README Thu Dec 13 18:22:00 2012 +0000 @@ -7,30 +7,30 @@ Why ? -According to the SliTaz forum, some new users have problems to burn CD-ROM, -create USB Keys, and boot these devices with the BIOS. Others are lost during -installation process or partitionning. +According to the SliTaz forum, some new users have problems burning CD-ROMs, +creating USB Keys and booting these devices with the BIOS. Others are lost +during the installation process or partitioning. The slitaz.exe program boots the SliTaz ISO image with a text menu: -- to start SliTaz in RAM (live) in graphic mode or text mode. +- to start SliTaz in RAM (live) in graphics mode or text mode. - to install SliTaz "a la UMSDOS" in the \slitaz\ subdirectory. The simplest - way install to SliTaz. No partionning. No questions. + way install to SliTaz. No partitioning. No questions. Usage: C:\> progname [mode] -Default mode is menu. mode can be: +Default mode is menu. Mode can be: - menu start with an interactive menu - live launch SliTaz in RAM with graphics - text launch SliTaz in RAM with text mode - install SliTaz UMSDOS like installation -If the progname name includes one of the supported mode, the according mode is +If the program name includes one of the supported modes; the according mode is assumed. Example 'C:\> slitazlive.exe' starts SliTaz in RAM with graphics. @@ -40,7 +40,7 @@ - isolinux uses the first 512 bytes for hybrid iso boot (ISO image in a partition). -- tazlito stores flavor extra infos at the 2nd Kb for 'tazlito iso2flavor'. +- tazlito stores extra flavor info at the 2nd Kb for 'tazlito iso2flavor'. The iso2exe tool moves the isolinux boot sector, installs its own boot sector with a DOS .EXE header, and adds a DOS .COM Linux loader and an initramfs in @@ -55,7 +55,7 @@ +-----------------+ unused +-----------------+ - | tazlito info | Flavor missing datas for 'tazlito iso2flavor' + | tazlito info | Flavor missing data for 'tazlito iso2flavor' 1K +-----------------+ | isohybrid boot | Starts isolinux.bin 512 +-----------------+ @@ -67,9 +67,9 @@ Limitations: -- Real mode support only. VM86 is not (yet?) supported +- Real mode support only. VM86 is not (yet?) supported. -- Image/zImage format not supported. bzImage only. Can't boot memtest or gpxe. +- Image/zImage format not supported, bzImage only. Can't boot memtest or gpxe. - The tiny Linux loader can't load more than 15Mb of files. (not really a problem since many-in-1 ISO format). @@ -77,8 +77,8 @@ - The DOS Linux loader and the ISO initramfs must fit in ~30Kb. - Old Linux kernels don't support multiple initramfs load. They will not - find the /init.exe file. As workaround, you can add the "text" argument: + find the /init.exe file. As a workaround, you can add the "text" argument: C:\> slitaz.exe text -- The ISO image must include the files /boot/bzImage and /boot/rootfs* +- The ISO image must include the files /boot/bzImage and /boot/rootfs*. diff -r 7d300004a3b8 -r 87a217af01ea syslinux/stuff/iso2exe/init --- a/syslinux/stuff/iso2exe/init Thu Dec 13 14:33:27 2012 +0100 +++ b/syslinux/stuff/iso2exe/init Thu Dec 13 18:22:00 2012 +0000 @@ -14,7 +14,7 @@ gettazboot() { - echo "Create $(basename $1) ..." + echo "Creating $(basename $1) ..." O=$(($(get 36 /mnt/$ISO 2) - 0xE0)) L=$((0x8000 - $(get 28 /mnt/$ISO 2) - $O)) S=$((32+$L)) @@ -67,7 +67,7 @@ mkinitrd() { - echo "Create $(basename $1) ..." + echo "Creating $(basename $1) ..." for i in bin lib dev proc tmp mnt etc ; do mkdir -p /tmp/fs/$i done @@ -154,10 +154,10 @@ --yes-label "Install" --yesno \ "\nSliTaz will be installed in the subdirectory \\slitaz of the current DOS/Windows partition. You will see your files from /mnt/dos.\n\n -You will start SliTaz with \\slitaz\\boot\\tazboot.exe\n\n +You can start SliTaz with \\slitaz\\boot\\tazboot.exe\n\n To uninstall SliTaz, you have only to remove this directory. The file \\boot.ini or \\config.sys may be modified too.\n\n -To do a traditionnal installation with disk partitioning +To do a traditional installation with disk partitioning - start SliTaz Live with 'SliTaz RAM boot' menu.\n " 16 70 [ $? -eq 0 -a -x /usr/sbin/mount.posixovl ] || return @@ -171,12 +171,12 @@ $DIALOG --clear \ --title " SliTaz bootloader for DOS " \ --yes-label "Install" --yesno \ -"\nThe file TAZBOOT.EXE will be created in top directory. It supports -bzImage linux kernel, multiples initramfs, kernel command line and -ISO image file loopback (can retrieve files from an ISO file).\n\n +"\nThe file TAZBOOT.EXE will be created in the top directory. It supports +a bzImage linux kernel, multiple initramfs', a kernel command line and +an ISO image file loopback (retrieves files from an ISO file).\n\n Usage: tazboot.exe [[@commands]|[kernel=] [initrd=[,...]] [iso=] cmdline args ...]\n\n -Defaults: tazboot @tazboot.cmd or tazboot kernel=bzImage auto\n\n\ +Defaults: tazboot @tazboot.cmd or tazboot kernel=bzImage auto\n\n\ Examples for tazboot.cmd:\n\n\ iso=\\isos\\slitaz-4.0.iso\n\ kernel=boot/bzImage\n\ diff -r 7d300004a3b8 -r 87a217af01ea syslinux/stuff/iso2exe/iso2exe.sh --- a/syslinux/stuff/iso2exe/iso2exe.sh Thu Dec 13 14:33:27 2012 +0100 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Thu Dec 13 18:22:00 2012 +0000 @@ -40,12 +40,12 @@ *0000) [ -x /usr/bin/isohybrid ] && isohybrid $1 esac [ ! -x /usr/sbin/mount.posixovl ] && - echo "No file mount.posixovl. Abort." 1>&2 && exit 1 + echo "No file mount.posixovl. Aborting." 1>&2 && exit 1 - echo "Move syslinux hybrid boot record..." + echo "Moving syslinux hybrid boot record..." ddq if=$1 bs=512 count=1 | ddq of=$1 bs=512 count=1 seek=1 conv=notrunc - echo "Insert EXE boot record..." + echo "Inserting EXE boot record..." $0 --get bootiso.bin | ddq of=$1 conv=notrunc # keep the largest room for the tazlito info file @@ -59,12 +59,12 @@ SIZE=$(wc -c < $TMP/rootfs.gz) store 28 $SIZE $1 OFS=$(( 0x8000 - $SIZE )) - printf "Add rootfs.gz file at %04X...\n" $OFS + printf "Adding rootfs.gz file at %04X...\n" $OFS cat $TMP/rootfs.gz | ddq of=$1 bs=1 seek=$OFS conv=notrunc rm -rf $TMP SIZE=$($0 --get lzcom.bin boot.com.lzma | wc -c) OFS=$(( $OFS - $SIZE )) - printf "Add DOS boot file at %04X...\n" $OFS + printf "Adding DOS boot file at %04X...\n" $OFS $0 --get lzcom.bin boot.com.lzma | ddq of=$1 bs=1 seek=$OFS conv=notrunc store 36 $(($OFS+0xE0)) $1 store 30 ${RANDOM:-0} $1