deprecate $MBR and use $GROOT instead everywhere

diff --git a/TODO b/TODO
index c5c7a62..57d50da 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,7 +7,6 @@ TODO list for grml-debootstrap
 * support bootoption debian2hd for installation through bootoption
 * support *full* automatic installation where not a single keypress is necessary
 * should we support mkinitrd for initrd creation in sarge?
-* normalize usage of TARGET, GROOT and MBR in config file
 
 Test matrix
 -----------

diff --git a/config b/config
index e6a0e8c..8e25e82 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: Fre Nov 03 23:19:35 CET 2006 [mika]
+# Latest change: Mon Nov 06 13:45:50 CET 2006 [mika]
 ################################################################################
 
 ################################################################################
@@ -20,11 +20,6 @@ TARGET=''
 # GROOT='hd0,0'
 GROOT=''
 
-# partition for use with grub-install
-# usage example:
-# MBR='/dev/hda'
-MBR=''
-
 ################################################################################
 # Now the variables you might want to adjust, but need not to...
 

diff --git a/grml-debootstrap b/grml-debootstrap
index d964257..617d5af 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 12:51:22 CET 2006 [mika]
+# Latest change: Mon Nov 06 13:45:41 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:  $MBR / $GROOT [if empty it will not be installed]
+   Install grub to:  $GROOT     [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 "$MBR" ] ; then
-   echo "Notice: \$MBR not set, will not install grub therefor."
+if [ -z "$GROOT" ] ; then
+   echo "Notice: \$GROOT not set, will not install grub therefor."
 else
-   einfo "Installing grub on ${MBR}:"
-   grub-install --root-directory="$MNTPOINT" "(${MBR})"
+   einfo "Installing grub on ${GROOT} / ${TARGET}:"
+   grub-install --root-directory="$MNTPOINT" "(${GROOT})"
    eend $?
 fi