From: Michael Prokop <mika@grml.org>
Date: Tue, 10 May 2011 17:18:47 +0000 (+0200)
Subject: Revert "Pass 1:0x96 instead of 4:0x96 to bootilnx.mksh to use first partition as... 
X-Git-Tag: v0.14.0~10
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=cb537a8079da9d9a75b049f2e2c6c7f87a905aa1

Revert "Pass 1:0x96 instead of 4:0x96 to bootilnx.mksh to use first partition as boot system."

This reverts commit aac340b028d5fa45a5e34d07fbd792858607b791.

The switch broke usb keys on some BIOS versions, causing freezes
while detecting the usb stick (without the option to even enter
the BIOS setup). 2010.12 used to work fine and when reverting it
via:

  (dd if=foo.iso bs=1 count=48 skip=462; dd if=foo.iso bs=1 count=16 skip=446) >x;
  dd of=foo.iso bs=1 conv=notrunc count=64 seek=446 if=x

it's working again. So revert to previous state.

Thanks to ryx for reporting and testing and Thorsten Glaser
for his valuable comments.
---

diff --git a/grml-live b/grml-live
index 6c3c549..7459f3d 100755
--- a/grml-live
+++ b/grml-live
@@ -1127,11 +1127,11 @@ else
            einfo "Creating hybrid ISO file with manifold method"
            if [ "$HYBRID_METHOD" = "grub2" ] ; then
                # 512 bytes: MBR, partition table, load GRUB 2
-               echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 1:0x96 -g $cyls:16:32
+               echo 4 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 4:0x96 -g $cyls:16:32
            else
               # read only one but 2048-byte sized (scale: << 2) sector
               echo $bootoff $bootoff | \
-                 mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 1:0x96 -g $cyls:16:32 -S 2
+                 mksh /usr/share/grml-live/scripts/bootilnx.mksh -A -M 4:0x96 -g $cyls:16:32 -S 2
            fi | dd of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc 2>/dev/null
            eend $?
          fi