X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=98e0e0edea042543bbcb7c8edc5fc3340612caeb;hp=3b403722bb6f40968f79d1301b519ae56419d5f7;hb=3264c61424d611142919f18593370b3012dc8a44;hpb=48aff5437a0bc1e9fe2c769aa373530c689d2139

diff --git a/grml-debootstrap b/grml-debootstrap
index 3b40372..98e0e0e 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:24:15 CET 2006 [mika]
+# Latest change: Fre Nov 03 21:35:09 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -13,10 +13,27 @@ 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
 
+# without config file it won't work
 if [ -r /etc/debootstrap/config ] ; then
    . /etc/debootstrap/config
 else
@@ -24,21 +41,48 @@ else
    exit 1
 fi
 
+# make sure at least $TARGET is set [the partition for the new system]
 if [ -z "$TARGET" ] ; then
    eerror "Please adjust /etc/debootstrap/config before running ${0}" ; eend 1
    exit 1
 fi
 
-# make an ext3 filesystem on /dev/sda1
-einfo "Running $MKFS on $TARGET"
-$MKFS $TARGET
-eend $?
+# 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]
+
+   Important! Continuing will delete all data from ${TARGET}!
+"
+einfon "Is this ok for you? [y/N] "
+
+read a
+if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
+   eerror "Exiting as requested." ; eend 1
+   exit 1
+fi
+
+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
-   eerror "$TARGEt already mounted, exiting."
+   eerror "$TARGET already mounted, exiting."
 else
+  [ -n "$MNTPOINT" ] || MNTPOINT='/mnt/test'
   einfo "Mounting $TARGET to $MNTPOINT"
+  [ -d "$MNTPOINT" ] || mkdir -p "$MNTPOINT"
   mount -o rw,suid,dev $TARGET $MNTPOINT
   eend $?
 fi
@@ -57,22 +101,36 @@ 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
+
   # 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/
   [ -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
 eend $?
 
+# einfo "Removing chroot-script"
+# rm -f $MNTPOINT/bin/chroot-script
+# eend $?
+
 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 #################################################################