Initial support for $ARCH.

Added function for clean exit (using trap).
Updated TODO file

diff --git a/TODO b/TODO
index e005cc6..b101c11 100644 (file)
--- a/TODO
+++ b/TODO
@@ -7,4 +7,5 @@ TODO list for grml-debootstrap
   * grml-x + xserver-xorg
 * support *full* automatic installation where not a single keypress is necessary
   -> support bootoption debian2hd for installation through bootoption on live-cd
+* support for LVM + SW-RAID
 * should we support mkinitrd for initrd creation in sarge?

diff --git a/config b/config
index ec8c3af..648214d 100644 (file)
--- 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: Mon Nov 06 22:31:08 CET 2006 [mika]
+# Latest change: Fre Nov 10 00:52:27 CET 2006 [mika]
 ################################################################################
 
 ################################################################################
@@ -46,6 +46,11 @@ CHROOTMIRROR='ftp://ftp.debian.de/debian'
 # supported values: sarge etch sid
 RELEASE='etch'
 
+# architecture (not yet officially supported by grml-debootstrap, work in progress)
+# if unset the default (i386) will be taken
+# notice: installing an amd64 system requires a 64bit kernel
+# ARCH='amd64'
+
 # hostname of new system
 HOSTNAME='grml'
 

diff --git a/debian/changelog b/debian/changelog
index 5f288b2..94f5f3a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-debootstrap (0.3) unstable; urgency=low
+
+  * Initial support for $ARCH.
+  * Added function for clean exit (using trap).
+
+ -- Michael Prokop <mika@grml.org>  Fri, 10 Nov 2006 00:51:09 +0100
+
 grml-debootstrap (0.2) unstable; urgency=low
 
   * Support Sarge and Sid as "$RELEASE"s as well.

diff --git a/grml-debootstrap b/grml-debootstrap
index dea48b7..d50ff6f 100644 (file)
--- 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: Mon Nov 06 15:57:52 CET 2006 [mika]
+# Latest change: Fre Nov 10 00:50:55 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -47,6 +47,20 @@ if [ -z "$TARGET" ] ; then
    exit 1
 fi
 
+function bailout(){
+  # make sure $TARGET is not mounted when exiting grml-debootstrap
+  if [ -n "$TARGET" ] ; then
+     if grep -q $TARGET /proc/mounts ; then
+        echo "Unmounting $TARGET"
+        umount "$TARGET"
+     fi
+  fi
+  [ -n "$1" ] && EXIT="$1" || EXIT="1"
+  exit "$EXIT"
+}
+
+trap bailout 1 2 3 15
+
 # user should recheck his configuration
 einfo "$0 - Please recheck configuration before execution:"
 echo "
@@ -88,8 +102,12 @@ else
 fi
 
 # get main packages from a debian-mirror
-einfo "Running $DEBOOTSTRAP for release $RELEASE using mirror $MIRROR"
-$DEBOOTSTRAP $RELEASE $MNTPOINT $MIRROR
+if [ -n "$ARCH" ] ; then
+   ARCHCMD="--arch $ARCH"
+   ARCHINFO=" (${ARCH})"
+fi
+einfo "Running $DEBOOTSTRAP for release ${RELEASE}${ARCHINFO} using mirror $MIRROR"
+$DEBOOTSTRAP $ARCHCMD $RELEASE $MNTPOINT $MIRROR
 eend $?
 
 einfo "Preparing chroot system"