X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml-debootstrap;h=bea4922309e1cc8c1b96f055261cc1bc2e160dba;hb=105fc25842a189a9342970ae9fb090da74ab236a;hp=8d6c59a0e852e38e6fb2ac2acf54ce4f108c20ef;hpb=8cedc171928bacf677b7bca3ae153efbf96fdb84;p=grml-debootstrap.git

diff --git a/grml-debootstrap b/grml-debootstrap
index 8d6c59a..bea4922 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 13:50:30 CET 2006 [mika]
+# Latest change: Fre Nov 03 17:49:46 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -13,9 +13,25 @@ set -e # exit on any error
 . /etc/grml/lsb-functions
 . /etc/grml/script-functions
 
-check4progs debootstrap || exit 1
+VERSION='0.1'
+
+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."
+     eend 0
+     exit 0
+   ;;
+   -v|--v*)
+     einfo "$0 version $VERSION"
+     einfo "Send bug reports to Michael Prokop <mika@grml.org>."
+     eend 0
+     exit 0
+   ;;
+esac
 
-set -u # make sure we don't have empty variables
+check4progs debootstrap || exit 1
+check4root || exit 1
 
 if [ -r /etc/debootstrap/config ] ; then
    . /etc/debootstrap/config
@@ -29,10 +45,17 @@ 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
 if grep -q $TARGET /proc/mounts ; then