added variable $GRUB for installation of grub in MBR itself

diff --git a/chroot-script b/chroot-script
index 675f9ec..27746dc 100644 (file)
--- a/chroot-script
+++ b/chroot-script
@@ -145,8 +145,10 @@ if [ -n "$INITRD" ] ; then
    fi
 fi
 
-if [ -n "$GROOT" ] ; then
-   echo "Installing grub"
+if [ -z "$GROOT" ] ; then
+   echo "Warning: $GROOT is not defined, can not adjust grub configuration therefor."
+else
+   echo "Adjusting grub configuration for use on ${GROOT}."
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub

diff --git a/config b/config
index 6c71915..2e1ddcb 100644 (file)
--- a/config
+++ b/config
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Nov 06 15:40:40 CET 2006 [mika]
+# Latest change: Mon Nov 06 15:56:03 CET 2006 [mika]
 ################################################################################
 
 ################################################################################
@@ -18,6 +18,14 @@ TARGET=''
 # notice: hd0,0 is first partition on first disk
 #         hd0   is MBR of first disk
 # usage example:
+# GRUB='hd0'
+GRUB=''
+
+# specify root device for usage in grub (corresponds with $TARGET)
+# notice: if you install Debian to /dev/hda1 use hd0,0
+#         hd0,0 is first partition on first disk
+#         hd0   is MBR of first disk
+# usage example:
 # GROOT='hd0,0'
 GROOT=''
 

diff --git a/grml-debootstrap b/grml-debootstrap
index 2fd9a1d..dea48b7 100644 (file)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Nov 06 15:33:14 CET 2006 [mika]
+# Latest change: Mon Nov 06 15:57:52 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -52,7 +52,7 @@ einfo "$0 - Please recheck configuration before execution:"
 echo "
    Target partition: $TARGET
    Mount-point:      $MNTPOINT
-   Install grub to:  $GROOT     [if empty grub will not be installed]
+   Install grub to:  $GROOT / $GRUB  [if empty grub will not be installed]
 
    Important! Continuing will delete all data from ${TARGET}!
 "
@@ -124,11 +124,11 @@ eend $?
 # rm -rf $MNTPOINT/etc/debootstrap/
 # eend $?
 
-if [ -z "$GROOT" ] ; then
-   echo "Notice: \$GROOT not set, will not install grub therefor."
+if [ -z "$GRUB" -o -z "$GROOT" ] ; then
+   echo "Notice: \$GRUB or \$GROOT not defined, will not install grub therefor."
 else
-   einfo "Installing grub on ${GROOT} / ${TARGET}:"
-   grub-install --root-directory="$MNTPOINT" "(${GROOT})"
+   einfo "Installing grub on ${GRUB}:"
+   grub-install --root-directory="$MNTPOINT" "(${GRUB})"
    eend $?
 fi