X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=0f6bcb91db0e84bd6a598090c2f9445ca3a105fd;hp=e842828815edbaa5eb8b2aff53acec81854cc143;hb=60a9691e1df16b1204cb5f39307ea63a8c643681;hpb=4afc5fef5545c3d2c34ad0252f2cb298f511c892

diff --git a/grml-debootstrap b/grml-debootstrap
index e842828..0f6bcb9 100644
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,21 +4,25 @@
 # 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:16:04 CET 2006 [mika]
+# Latest change: Mon Apr 09 14:41:57 CEST 2007 [mika]
 ################################################################################
-# http://www.debian.org/releases/stable/i386/apcs04.html.en
+# http://www.debian.org/releases/stable/i386/index.html.en
 
 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,16 +71,17 @@ 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
@@ -86,6 +91,7 @@ echo "
    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
@@ -126,7 +132,12 @@ fi
 if [ -n "$ARCH" ] ; then
    ARCHCMD="--arch $ARCH"
    ARCHINFO=" (${ARCH})"
+else
+   ARCH="$(dpkg --print-architecture)"
+   ARCHCMD="--arch $ARCH"
+   ARCHINFO=" (${ARCH})"
 fi
+
 einfo "Running $DEBOOTSTRAP for release ${RELEASE}${ARCHINFO} using mirror $MIRROR"
 $DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $MIRROR
 eend $?
@@ -155,7 +166,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"