From 8cedc171928bacf677b7bca3ae153efbf96fdb84 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 3 Nov 2006 15:18:57 +0100
Subject: [PATCH] do not use savedefault in menu.lst, support fsck

---
 chroot-script    | 36 +++---------------------------------
 config           |  8 +++++++-
 grml-debootstrap |  7 +++++++
 3 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/chroot-script b/chroot-script
index 66fa705..1ce5ac7 100644
--- a/chroot-script
+++ b/chroot-script
@@ -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 15:06:22 CET 2006 [mika]
+# Latest change: Fre Nov 03 15:14:28 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -96,48 +96,18 @@ fi
 
 if [ -n "$GROOT" ] ; then
    echo "Installing grub"
-#   if ! [ -f /boot/grub/menu.lst ] ; then
-#      # setup grub
-#      mkdir /boot/grub
-#      cat >> /boot/grub/menu.lst << EOF
-## Boot automatically after 30 secs.
-#timeout 30
-#
-## By default, boot the first entry.
-#default 0
-#
-## Fallback to the second entry.
-#fallback 1
-#
-#title           Debian Etch, kernel $KERNELVER (on $ARGET)
-#root            (hd0,0)
-#kernel          $KERNELIMG root=$TARGET ro
-#$GRUBINITRD
-#
-## For booting Windows
-## title Windows
-## rootnoverify (hd0,0)
-## makeactive
-## chainloader  +1
-#EOF
-#   fi
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub
    cp /usr/lib/grub/i386-pc/* /boot/grub/
 
-   # otherwise grub fails with 'Could not find device for /boot/boot: not found or not a block device'
-   # cp /etc/mtab /etc/mtab.old
-   # cp /proc/mounts /etc/mtab
-
    # finally install grub
-   # grub-install $BOOT
    update-grub -y
    sed -i "s/groot=.*/groot=(${GROOT})/g" /boot/grub/menu.lst
+   # not sure why savedefault does not work for me; any ideas?
+   sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
    update-grub -y
 
-   # restore mtab again
-   # mv /etc/mtab.old /etc/mtab
 fi
 
 # unmount all filesystems in chroot, make sure nothing is left...
diff --git a/config b/config
index 628c3cf..8071706 100644
--- a/config
+++ b/config
@@ -3,7 +3,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 14:23:32 CET 2006 [mika]
+# Latest change: Fre Nov 03 15:18:38 CET 2006 [mika]
 ################################################################################
 
 ################################################################################
@@ -50,6 +50,12 @@ HOSTNAME='grml'
 # executable which should be run on $TARGET
 MKFS='mkfs.ext3'
 
+# check filesyste after installation?
+FSCK='yes'
+
+# which tool should be used for fsck? if unset the tool will be guesst based on $MKFS
+# FSCKTOOL=''
+
 # which packages do you want do dpkg-reconfigure?
 RECONFIGURE='locales console-data'
 
diff --git a/grml-debootstrap b/grml-debootstrap
index f680fd1..8d6c59a 100644
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -73,6 +73,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 #################################################################
-- 
2.1.4