X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=d50ff6f46a3eb2970297622778771267615d14f6;hp=024c33f1acd3566647a647b086f97212a58f2c3c;hb=e1e969b72647388dee194cccb5bb54cf3a5d5566;hpb=d01d89592be4e0cb1d4669fddca3d0da9a66cc4f

diff --git a/grml-debootstrap b/grml-debootstrap
index 024c33f..d50ff6f 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 03 18:05:56 CET 2006 [mika]
+# Latest change: Fre Nov 10 00:50:55 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*)
@@ -47,12 +47,26 @@ if [ -z "$TARGET" ] ; then
    exit 1
 fi
 
+function bailout(){
+  # make sure $TARGET is not mounted when exiting grml-debootstrap
+  if [ -n "$TARGET" ] ; then
+     if grep -q $TARGET /proc/mounts ; then
+        echo "Unmounting $TARGET"
+        umount "$TARGET"
+     fi
+  fi
+  [ -n "$1" ] && EXIT="$1" || EXIT="1"
+  exit "$EXIT"
+}
+
+trap bailout 1 2 3 15
+
 # user should recheck his configuration
 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 / $GRUB  [if empty grub will not be installed]
 
    Important! Continuing will delete all data from ${TARGET}!
 "
@@ -88,8 +102,12 @@ else
 fi
 
 # get main packages from a debian-mirror
-einfo "Running $DEBOOTSTRAP for release $RELEASE using mirror $MIRROR"
-$DEBOOTSTRAP $RELEASE $MNTPOINT $MIRROR
+if [ -n "$ARCH" ] ; then
+   ARCHCMD="--arch $ARCH"
+   ARCHINFO=" (${ARCH})"
+fi
+einfo "Running $DEBOOTSTRAP for release ${RELEASE}${ARCHINFO} using mirror $MIRROR"
+$DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $MIRROR
 eend $?
 
 einfo "Preparing chroot system"
@@ -101,6 +119,12 @@ einfo "Preparing chroot system"
   cp /etc/debootstrap/config $MNTPOINT/etc/debootstrap/
   cp /etc/debootstrap/packages $MNTPOINT/etc/debootstrap/packages
 
+  # make sure we can access network [relevant for cdebootstrap]
+  [ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf
+
+  # setup default locales
+  [ -n "$LOCALES" ] && cp /etc/debootstrap/locale.gen  $MNTPOINT/etc/locale.gen
+
   # copy any existing existing files to chroot
   [ -d /etc/debootstrap/boot  ] && cp -a /etc/debootstrap/boot/*  $MNTPOINT/boot/
   [ -d /etc/debootstrap/etc   ] && cp -a /etc/debootstrap/etc/*   $MNTPOINT/etc/
@@ -113,6 +137,19 @@ einfo "Executing chroot-script now"
 chroot $MNTPOINT /bin/chroot-script
 eend $?
 
+# einfo "Removing chroot-script"
+# rm -f  $MNTPOINT/bin/chroot-script
+# rm -rf $MNTPOINT/etc/debootstrap/
+# eend $?
+
+if [ -z "$GRUB" -o -z "$GROOT" ] ; then
+   echo "Notice: \$GRUB or \$GROOT not defined, will not install grub therefor."
+else
+   einfo "Installing grub on ${GRUB}:"
+   grub-install --root-directory="$MNTPOINT" "(${GRUB})"
+   eend $?
+fi
+
 einfo "Unmount $MNTPOINT"
 umount $MNTPOINT
 eend $?