X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=dea48b7d528f8cec1fffbcfa13d1959a87dbedf9;hp=617d5af51fbd05d17b376dc5b99229aae59838d5;hb=760de504295d5651e57b4c994da4ebb67403ba29;hpb=544108ff0c61043d4eee2d1ba4c1d40ef3a6c236

diff --git a/grml-debootstrap b/grml-debootstrap
index 617d5af..dea48b7 100644
--- 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 13:45:41 CET 2006 [mika]
+# Latest change: Mon Nov 06 15:57:52 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -13,7 +13,7 @@ set -e # exit on any error
 . /etc/grml/lsb-functions
 . /etc/grml/script-functions
 
-VERSION='0.1'
+VERSION='0.2'
 
 case $* in
    -h*|--h*)
@@ -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