X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=6ba78425e1c32355165b21aae30671cb5160af58;hp=f4838f0afbacf93bfb3f8fd2191b3760c8699aa3;hb=d965b4983de8c08698d60c3d23c446d0acba0e5e;hpb=0e331baedd30bdf788922f8d4f4082d960498be7

diff --git a/grml-debootstrap b/grml-debootstrap
index f4838f0..6ba7842 100644
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,13 +4,13 @@
 # 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: Don Apr 12 11:42:02 CEST 2007 [mika]
+# Latest change: Don Apr 12 11:55:21 CEST 2007 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/index.html.en
 
 set -e # exit on any error
 
-VERSION='0.6'
+VERSION='0.8'
 
 # source core functions {{{
 . /etc/grml/lsb-functions
@@ -94,6 +94,11 @@ else
    ARCHINFO=" (${ARCH})"
 fi
 
+# provide variables to chroot system
+echo "
+ARCH=$ARCH
+" > /etc/debootstrap/variables
+
 # 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
@@ -204,8 +209,9 @@ preparechroot() {
   mkdir $MNTPOINT/etc/debootstrap/
 
   # make sure we have our files for later use via chroot-script
-  cp /etc/debootstrap/config $MNTPOINT/etc/debootstrap/
-  cp /etc/debootstrap/packages $MNTPOINT/etc/debootstrap/packages
+  cp /etc/debootstrap/config    $MNTPOINT/etc/debootstrap/
+  cp /etc/debootstrap/packages  $MNTPOINT/etc/debootstrap/packages
+  cp /etc/debootstrap/variables $MNTPOINT/etc/debootstrap/variables
 
   # make sure we can access network [relevant for cdebootstrap]
   [ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf
@@ -265,15 +271,15 @@ fscktool() {
 # }}}
 
 # now execute all the functions {{{
-  stage mkfs               && mkfs               && stage mkfs done
-  stage tunefs             && tunefs             && stage tunefs done
-  stage mount_target       && mount_target       && stage mount_target done
-  stage debootstrap_system && debootstrap_system && stage debootstrap_system done
-  stage preparechroot      && preparechroot      && stage preparechroot done
-  stage chrootscript       && chrootscript       && stage chrootscript done
-  stage grub_install       && grub_install       && stage grub_install done
-  stage umount_chroot      && umount_chroot      && stage umount_chroot done
-  stage fscktool           && fscktool           && stage fscktool done
+  stage mkfs               && mkfs               && stage mkfs done               || bailout
+  stage tunefs             && tunefs             && stage tunefs done             || bailout
+  stage mount_target       && mount_target       && stage mount_target done       || bailout
+  stage debootstrap_system && debootstrap_system && stage debootstrap_system done || bailout
+  stage preparechroot      && preparechroot      && stage preparechroot done      || bailout
+  stage chrootscript       && chrootscript       && stage chrootscript done       || bailout
+  stage grub_install       && grub_install       && stage grub_install done       || bailout
+  stage umount_chroot      && umount_chroot      && stage umount_chroot done      || bailout
+  stage fscktool           && fscktool           && stage fscktool done           || bailout
 # }}}
 
 # stages {{{