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

diff --git a/grml-debootstrap b/grml-debootstrap
index 617d5af..e842828 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: Fre Nov 17 23:16:04 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,15 +47,45 @@ 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
+
+PARTITION=''
+DIRECTORY=''
+
+case $TARGET in
+  /dev/*)
+    PARTITION=1
+       ;;
+       *)
+       # assume we are installing into a directory, don't run mkfs and grub related stuff therefore
+    DIRECTORY=1
+    MNTPOINT="$TARGET"
+    MKFS=''
+    TUNE2FS=''
+    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     [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
 einfon "Is this ok for you? [y/N] "
 
 read a
@@ -76,20 +106,29 @@ if [ -n "$TUNE2FS" ] ; then
    eend $?
 fi
 
-# now mount the new partition
-if grep -q $TARGET /proc/mounts ; then
-   eerror "$TARGET already mounted, exiting."
+
+# now mount the new partition or if it's a directory do nothing at all
+if [ -n "$DIRECTORY" ] ; then
+   einfo "Running grml-debootstrap on a directory, nothing to mount."
 else
-  [ -n "$MNTPOINT" ] || MNTPOINT='/mnt/test'
-  einfo "Mounting $TARGET to $MNTPOINT"
-  [ -d "$MNTPOINT" ] || mkdir -p "$MNTPOINT"
-  mount -o rw,suid,dev $TARGET $MNTPOINT
-  eend $?
+   if grep -q $TARGET /proc/mounts ; then
+      eerror "$TARGET already mounted, exiting."
+   else
+     [ -n "$MNTPOINT" ] || MNTPOINT='/mnt/test'
+     [ -d "$MNTPOINT" ] || mkdir -p "$MNTPOINT"
+     einfo "Mounting $TARGET to $MNTPOINT"
+     mount -o rw,suid,dev $TARGET $MNTPOINT
+     eend $?
+   fi
 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"
@@ -124,17 +163,19 @@ 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
 
-einfo "Unmount $MNTPOINT"
-umount $MNTPOINT
-eend $?
+if [ -n "$PARTITION" ] ; then
+   einfo "Unmount $MNTPOINT"
+   umount $MNTPOINT
+   eend $?
+fi
 
 if [ "$FSCK" = 'yes' ] ; then
    [ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}"