X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=f31680200945f617a864eb62d5993470861b4380;hp=87166bf01d8c0d1e26f7eebb58c14fd0c9e4e02a;hb=3b8197edc1b836dff40d7d067cb7fc05f7c572fa;hpb=90f264b5ef5d4f35c8b2bbf9e2a1ce0b75e830ef

diff --git a/grml-debootstrap b/grml-debootstrap
index 87166bf..f316802 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: Fre Nov 17 23:00:30 CET 2006 [mika]
+# Latest change: Mon Apr 09 14:35:18 CEST 2007 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -13,12 +13,16 @@ set -e # exit on any error
 . /etc/grml/lsb-functions
 . /etc/grml/script-functions
 
-VERSION='0.2'
+# inside the chroot system the locales might not be available, so use minimum:
+export LANG=C
+export LC_ALL=C
+
+VERSION='0.6'
 
 case $* in
    -h*|--h*)
      einfo "$0 - wrapper around debootstrap for installing plain Debian via grml"
-     einfo "Configure via /etc/debootstrap/config and invoke $0 afterwards."
+     einfo "Adjust /etc/debootstrap/config and invoke $0 afterwards."
      eend 0
      exit 0
    ;;
@@ -67,27 +71,27 @@ DIRECTORY=''
 case $TARGET in
   /dev/*)
     PARTITION=1
-       ;;
-       *)
-       # assume we are installing into a directory, don't run mkfs and grub related stuff therefore
+    ;;
+  *)
+    # assume we are installing into a directory, don't run mkfs and grub related stuff therefore
     DIRECTORY=1
     MNTPOINT="$TARGET"
     MKFS=''
     TUNE2FS=''
+    FSCK=''
     GRUB=''
     GROOT=''
-       ;;
+    ;;
 esac
 
 # user should recheck his configuration
 einfo "$0 - Please recheck configuration before execution:"
 echo "
-   Target partition: $TARGET
-   Mount-point:      $MNTPOINT
-   Install grub to:  $GROOT / $GRUB  [if empty grub will not be installed]
-
-   Important! Continuing will delete all data from ${TARGET}!
-"
+   Target:           $TARGET"
+   case "$MNTPOINT" in "$TARGET") ;; *) echo "   Mount-point:      $MNTPOINT" ;; esac
+   [ -n "$GRUB" ] && echo "   Install grub to:  $GROOT / $GRUB"
+   case "$MNTPOINT" in "$TARGET") ;; *) echo "  Important! Continuing will delete all data from ${TARGET}!" ;; esac
+   echo
 einfon "Is this ok for you? [y/N] "
 
 read a
@@ -157,7 +161,7 @@ einfo "Preparing chroot system"
 eend 0
 
 einfo "Executing chroot-script now"
-chroot $MNTPOINT /bin/chroot-script
+chroot "$MNTPOINT" /bin/chroot-script
 eend $?
 
 # einfo "Removing chroot-script"