updated TODO

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index 2e1a1dc..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.
 # 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:31:46 CET 2006 [mika]
+# Latest change: Mon Nov 06 15:57:52 CET 2006 [mika]

 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
 ################################################################################
 # 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
 
 . /etc/grml/lsb-functions
 . /etc/grml/script-functions
 

-VERSION='0.1'
+VERSION='0.2'

 
 case $* in
    -h*|--h*)
 
 case $* in
    -h*|--h*)


@@ -52,7 +52,7 @@ einfo "$0 - Please recheck configuration before execution:"
 echo "
    Target partition: $TARGET
    Mount-point:      $MNTPOINT
 echo "
    Target partition: $TARGET
    Mount-point:      $MNTPOINT

-   Install grub to:  $MBR / $GROOT [if empty it will not be installed]
+   Install grub to:  $GROOT / $GRUB  [if empty grub will not be installed]

 
    Important! Continuing will delete all data from ${TARGET}!
 "
 
    Important! Continuing will delete all data from ${TARGET}!
 "


@@ -124,18 +124,18 @@ eend $?
 # rm -rf $MNTPOINT/etc/debootstrap/
 # eend $?
 
 # rm -rf $MNTPOINT/etc/debootstrap/
 # eend $?
 

-einfo "Unmount $MNTPOINT"
-umount $MNTPOINT
-eend $?
-
-if [ -z "$MBR" ] ; then
-   echo "Notice: \$MBR 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
 else

-   einfo "Installing grub on ${MBR}:"
-   grub-install --root-directory="$MNTPOINT" "(${MBR})"
+   einfo "Installing grub on ${GRUB}:"
+   grub-install --root-directory="$MNTPOINT" "(${GRUB})"

    eend $?
 fi
 
    eend $?
 fi
 

+einfo "Unmount $MNTPOINT"
+umount $MNTPOINT
+eend $?
+

 if [ "$FSCK" = 'yes' ] ; then
    [ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}"
    einfo "Checking filesystem on $TARGET using $FSCKTOOL"
 if [ "$FSCK" = 'yes' ] ; then
    [ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}"
    einfo "Checking filesystem on $TARGET using $FSCKTOOL"