Make chrootscript() more independent

[grml-debootstrap.git] / grml-debootstrap

diff --git a/grml-debootstrap b/grml-debootstrap
index f4838f0..7a5c9f0 100644 (file)
--- 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: 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
@@ -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
@@ -117,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
 }
 # }}}
@@ -204,8 +210,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
@@ -225,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
 }
 # }}}
 
@@ -265,15 +280,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 2 "i"
+    fi
+done
 # }}}
 
 # stages {{{