From 2d25ecbf349a8bf1f8d13700807c2a45c13216f3 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 3 Nov 2006 17:22:52 +0100
Subject: [PATCH] run grub-install ; added TODO file ; remove debian/docs

---
 TODO           |  7 +++++++
 chroot-script  | 13 ++++++++++---
 config         | 10 +++++++++-
 debian/control |  5 +++++
 debian/docs    |  0
 debian/rules   |  3 +--
 6 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 TODO
 delete mode 100644 debian/docs

diff --git a/TODO b/TODO
new file mode 100644
index 0000000..f47bfa5
--- /dev/null
+++ b/TODO
@@ -0,0 +1,7 @@
+TODO list for grml-debootstrap
+------------------------------
+
+* test cdebootstrap instead of debootstrap
+* test all possibilities of customization
+* support tarballs for customization
+* test sarge + sid as $RELEASE
diff --git a/chroot-script b/chroot-script
index fc35e95..aa46874 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:24:53 CET 2006 [mika]
+# Latest change: Fre Nov 03 17:15:42 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -17,9 +17,9 @@ if [ -n "$CHROOTMIRROR" ] ; then
    echo "$CHROOTMIRROR" > /etc/apt/sources.list
 fi
 
-#if ! [ -n /etc/kernel-img.conf ] ; then
+# if ! [ -n /etc/kernel-img.conf ] ; then
 #   echo "do_initrd = Yes" > /etc/kernel-img.conf
-#fi
+# fi
 
 # install additional packages
 if [ "$PACKAGES" = 'yes' ] ; then
@@ -112,6 +112,13 @@ if [ -n "$GROOT" ] ; then
    sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
    update-grub -y
 
+   if [ -z "$MBR" ] ; then
+      echo "Notice: \$MBR not set, not install grub therefore."
+   else
+      cp /proc/mounts /etc/mtab
+      grub-install "$MBR"
+      rm /etc/mtab
+   fi
 fi
 
 # unmount all filesystems in chroot, make sure nothing is left...
diff --git a/config b/config
index db22e6d..d7ed365 100644
--- a/config
+++ b/config
@@ -3,20 +3,28 @@
 # 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:23:37 CET 2006 [mika]
+# Latest change: Fre Nov 03 17:14:33 CET 2006 [mika]
 ################################################################################
 
 ################################################################################
 # Important: you definitely have to adjust the following variables!
 ################################################################################
 # target partition (where should Debian be installed to)
+# usage example:
+# TARGET='/dev/hda1'
 TARGET=''
 
 # where do you want to install grub to?
+# notice: hd0,0 is *first* partition on *first* disk (/dev/sda1 + /dev/hda1)
 # usage example:
 # GROOT='hd0,0'
 GROOT=''
 
+# partition for use with grub-install
+# usage example:
+# MBR='/dev/hda'
+MBR=''
+
 ################################################################################
 
 # kernel version
diff --git a/debian/control b/debian/control
index 5f67376..878a481 100644
--- a/debian/control
+++ b/debian/control
@@ -11,3 +11,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: wrapper around debootstrap for installing plain Debian via grml
  This package provides a wrapper suite around deboostrap and
  cdebootstrap for installing a plain Debian system via grml.
+ .
+ All you have to do is adjust a few variables in configuration
+ file /etc/debootstrap/config and invoke grml-debootstrap then.
+ A plain and base Debian system will be installed on the given
+ device then. Customization of this process is possible as well.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/rules b/debian/rules
index eb5f23f..5f732d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,8 +42,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
+	dh_installdocs TODO
 	dh_installman debian/grml-debootstrap.8
 	dh_link
 	dh_strip
-- 
2.1.4