X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=0bbe4098cdcd7e4d401ec93ce5d0f8ecea5f84dd;hp=dd16b4c144d5ac47e43976468dea525b076bfd8d;hb=89e2ad98ad3b1362bb43d7b1634780c1c9db372f;hpb=f57ddab767aa174cdee6003ed6d13a5100044d41;ds=sidebyside

diff --git a/grml-debootstrap b/grml-debootstrap
index dd16b4c..0bbe409 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 11:15:56 CET 2006 [mika]
+# Latest change: Fre Nov 03 15:34:02 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -15,8 +15,6 @@ set -e # exit on any error
 
 check4progs debootstrap || exit 1
 
-set -u # make sure we don't have empty variables
-
 if [ -r /etc/debootstrap/config ] ; then
    . /etc/debootstrap/config
 else
@@ -29,15 +27,26 @@ if [ -z "$TARGET" ] ; then
    exit 1
 fi
 
-# make an ext3 filesystem on /dev/sda1
-einfo "Running $MKFS on $TARGET"
-$MKFS $TARGET
-eend $?
+if [ -n "$MKFS" ] ; then
+   einfo "Running $MKFS on $TARGET"
+   $MKFS $TARGET
+   eend $?
+fi
+
+if [ -n "$TUNE2FS" ] ; then
+   einfo "Disabling automatic filesystem check on $TARGET via tune2fs"
+   TUNE2FS $TARGET
+   eend $?
+fi
 
 # now mount the new partition
-einfo "Mounting $TARGET to $MNTPOINT"
-mount -o rw,suid,dev $TARGET $MNTPOINT
-eend $?
+if grep -q $TARGET /proc/mounts ; then
+   eerror "$TARGEt already mounted, exiting."
+else
+  einfo "Mounting $TARGET to $MNTPOINT"
+  mount -o rw,suid,dev $TARGET $MNTPOINT
+  eend $?
+fi
 
 # get main packages from a debian-mirror
 einfo "Running $DEBOOTSTRAP for release $RELEASE using mirror $MIRROR"
@@ -59,7 +68,7 @@ einfo "Preparing chroot system"
   [ -d /etc/debootstrap/share ] && cp -a /etc/debootstrap/share/* $MNTPOINT/share/
   [ -d /etc/debootstrap/usr   ] && cp -a /etc/debootstrap/usr/*   $MNTPOINT/usr/
   [ -d /etc/debootstrap/var   ] && cp -a /etc/debootstrap/var/*   $MNTPOINT/var/
-eend $?
+eend 0
 
 einfo "Executing chroot-script now"
 chroot $MNTPOINT /bin/chroot-script
@@ -69,6 +78,13 @@ einfo "Unmount $MNTPOINT"
 umount $MNTPOINT
 eend $?
 
+if [ "$FSCK" = 'yes' ] ; then
+   [ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}"
+   einfo "Checking filesystem on $TARGET using $FSCKTOOL"
+   $FSCKTOOL $TARGET
+   eend $?
+fi
+
 einfo "Finished execution of $0 - enjoy your Debian system." ; eend 0
 
 ## END OF FILE #################################################################