X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=8473abf7848fbeeef3897b5be0107536c7d3e99a;hp=600b5c96b8593bc013dc6ae1b17ed1eb9e50a436;hb=bd35f4be8bcd23fdc58682a92622c5928dbc0114;hpb=d69218f11da4d5c71c1829fbb671d167432d434c

diff --git a/grml-debootstrap b/grml-debootstrap
index 600b5c9..8473abf 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:39:22 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
@@ -59,9 +59,11 @@ if [ -z "$STAGES" ] ; then
    [ -d "$STAGES" ] || mkdir -p "$STAGES"
 fi
 
-if grep -q done $STAGES/grml-debootstrap ; then
-   eerror "Error: grml-debootstrap has been executed already, won't continue therefore."
-   eerror "If you want to re-execute grml-debootstrap just manually remove ${STAGES}" ; eend 1
+if [ -r $STAGES/grml-debootstrap ] ; then
+   if grep -q done $STAGES/grml-debootstrap ; then
+      eerror "Error: grml-debootstrap has been executed already, won't continue therefore."
+      eerror "If you want to re-execute grml-debootstrap just manually remove ${STAGES}" ; eend 1
+   fi
 fi
 
 PARTITION=''
@@ -92,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
@@ -121,12 +128,12 @@ trap bailout 1 2 3 15
 
 # we want to execute all the functions only once, simple check for it:
 stage() {
-  if grep -q done "$STAGES/$1" 2>/dev/null ; then
-     ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
-     return 1
-  else
+  if [ -n "$2" ] ; then
      echo "$2" > "$STAGES/$1"
      return 0
+  elif grep -q done "$STAGES/$1" 2>/dev/null ; then
+     ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
+     return 1
   fi
 }
 # }}}
@@ -202,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
@@ -263,15 +271,12 @@ 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
+for i in mkfs tunefs mount_target debootstrap_system preparechroot \
+         chrootscript grub_install umount_chroot fscktool ; do
+    if stage $i ; then
+       $i && stage $i done || bailout
+    fi
+done
 # }}}
 
 # stages {{{