X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=7a5c9f066b19511c3c2501297ee7ecba3226a7e1;hp=72098fbae2adb584213de2df5e40991d8f957fa6;hb=c4ffcff0a85b654adc06e0b1fe4ef06927e20b26;hpb=7ab56e7053ae81a293d7eb905dbd288f6a009411

diff --git a/grml-debootstrap b/grml-debootstrap
index 72098fb..7a5c9f0 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:55:21 CEST 2007 [mika]
+# Latest change: Mon Apr 16 13:11:33 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
@@ -122,18 +122,19 @@ bailout(){
      fi
   fi
   [ -n "$1" ] && EXIT="$1" || EXIT="1"
+  [ -n "$3" ] && einfo "Notice: just remove $STAGES/$3 to reexecute the stage"
   exit "$EXIT"
 }
 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
 }
 # }}}
@@ -231,9 +232,17 @@ preparechroot() {
 
 # execute chroot-script {{{
 chrootscript() {
-  einfo "Executing chroot-script now"
-  chroot "$MNTPOINT" /bin/chroot-script
-  eend $?
+  if ! [ -r "$MNTPOINT/bin/chroot-script" ] ; then
+     mount_target
+  fi
+  if [ -x "$MNTPOINT/bin/chroot-script" ] ; then
+     einfo "Executing chroot-script now"
+     chroot "$MNTPOINT" /bin/chroot-script
+     eend $?
+  else
+     eerror "Fatal: $MNTPOINT/bin/chroot-script could not be found."
+     eend 1
+  fi
 }
 # }}}
 
@@ -271,15 +280,12 @@ fscktool() {
 # }}}
 
 # now execute all the functions {{{
-  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
+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 2 "i"
+    fi
+done
 # }}}
 
 # stages {{{