Change bootgrub.mksh invocation to use the new features.

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>

diff --git a/grml-live b/grml-live
index 5e081ba..df26b86 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -776,7 +776,10 @@ else
          else
            log "Creating hybrid ISO file with manifold method"
            einfo "Creating hybrid ISO file with manifold method"
-           echo 1 63 | mksh /usr/share/grml-live/scripts/bootgrub.mksh | cat - boot/grub/core.img | dd conv=notrunc of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc
+           echo 1 63 | \
+               mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 1 -g $cyls:16:32 | \
+               cat - boot/grub/core.img | \
+               dd conv=notrunc of="${ISO_OUTPUT}/${ISO_NAME}" conv=notrunc 2>/dev/null
            eend $?
          fi
       fi

diff --git a/scripts/bootgrub.mksh b/scripts/bootgrub.mksh
index 7bbe289..34421f7 100644 (file)
--- a/scripts/bootgrub.mksh
+++ b/scripts/bootgrub.mksh
@@ -1,6 +1,6 @@
 #!/usr/bin/env mksh
 # $Id$
-# $miros: src/sys/arch/i386/stand/bootxx/mkbxinst.sh,v 1.18 2009/06/07 13:07:46 tg Exp $
+# $miros: src/sys/arch/i386/stand/bootxx/mkbxinst.sh,v 1.19 2009/06/07 17:53:29 tg Exp $
 #-
 # Copyright (c) 2007, 2008, 2009
 #      Thorsten Glaser <tg@mirbsd.org>
@@ -140,7 +140,7 @@ if (( g_code[0] )); then
        if (( g_code[0] < 1 || g_code[1] < 1 || g_code[1] > 256 ||
            g_code[2] < 1 || g_code[2] > 63 )); then
                print -u2 Invalid geometry, values out of bounds.
-       elif [[ $(print "(${g_code[0]} * ${g_code[1]} * {g_code[2]})" \
+       elif [[ $(print "(${g_code[0]} * ${g_code[1]} * ${g_code[2]})" \
            "> 4294967295" | bc) = 1 ]]; then
                print -u2 Invalid geometry, more than 2 TiB of data.
        else