X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=f60a7455b077206b1bc22304adb25b2c8650d153;hp=f781b62b81e62b5ceb7fd2c5ec35e9366f140326;hb=2e56931d2a294b08b2d32d4f71015ee541c3951b;hpb=4c748114cccfa2e494a55a7dbe021c8f0d154736

diff --git a/grml-live b/grml-live
index f781b62..f60a745 100755
--- a/grml-live
+++ b/grml-live
@@ -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 or any later version.
-# Latest change: Mit Okt 10 09:38:42 CEST 2007 [mika]
+# Latest change: Wed Oct 17 22:59:03 CEST 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -22,7 +22,7 @@ if [ "$(id -u 2>/dev/null)" != 0 ] ; then
 fi
 
 if [ -r /var/run/fai/FAI_INSTALLATION_IN_PROGRESS ] ; then
-   echo "/usr/sbin/fai already running or was aborted before."&>2
+   echo "/usr/sbin/fai already running or was aborted before.">&2
    echo "You may remove /var/run/fai/FAI_INSTALLATION_IN_PROGRESS and try again.">&2
    exit 1
 fi
@@ -152,19 +152,20 @@ http://grml.org/bugs/
 
 # command line parsing {{{
 
-while getopts "c:g:i:o:r:s:t:v:FhV" opt; do
+while getopts "a:c:g:i:o:r:s:t:v:FhV" opt; do
   case "$opt" in
+    a) ARCH="$OPTARG" ;;
     c) CLASSES="$OPTARG" ;;
     g) GRML_NAME="$OPTARG" ;;
     i) ISO_NAME="$OPTARG" ;;
-    r) RELEASENAME="$OPTARG" ;;
-    s) SUITE="$OPTARG" ;;
-    t) TEMPLATE_DIRECTORY="$OPTARG";;
     o) OUTPUT="$OPTARG"
        CHROOT_OUTPUT="$OUTPUT/grml_chroot"
        BUILD_OUTPUT="$OUTPUT/grml_cd"
        ISO_OUTPUT="$OUTPUT/grml_isos"
        ;;
+    r) RELEASENAME="$OPTARG" ;;
+    s) SUITE="$OPTARG" ;;
+    t) TEMPLATE_DIRECTORY="$OPTARG";;
     v) VERSION="$OPTARG" ;;
     F) FORCE=1 ;;
     h) usage ; bailout 0 ;;
@@ -174,6 +175,7 @@ while getopts "c:g:i:o:r:s:t:v:FhV" opt; do
 done
 shift $(($OPTIND - 1))  # set ARGV to the first not parsed commandline parameter
 
+echo "Executing: $(basename $0) $*" >> $LOGFILE
 # }}}
 
 # some misc checks before executing FAI {{{
@@ -197,6 +199,7 @@ if [ -z "$FORCE" ] ; then
    [ -n "$RELEASENAME" ]   && echo "  release name:      $RELEASENAME"
    [ -n "$VERSION" ]       && echo "  grml version:      $VERSION"
    [ -n "$SUITE" ]         && echo "  Debian suite:      $SUITE"
+   [ -n "$ARCH" ]          && echo "  Architecture:      $ARCH"
    [ -n "$BOOT_METHOD" ]   && echo "  Boot method:       $BOOT_METHOD"
    [ -n "$TEMPLATE_DIRECTORY" ] && echo "  Template files:    $TEMPLATE_DIRECTORY"
    [ -n "$FAI_ARGS" ]      && echo "  additional arguments for FAI: $FAI_ARGS"
@@ -245,6 +248,12 @@ if [ -n "$SUITE" ] ; then
    sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" $LIVE_CONF
    sed -i "s|FAI_DEBOOTSTRAP=\"[a-z]* |FAI_DEBOOTSTRAP=\"$SUITE |" /etc/grml/fai/make-fai-nfsroot.conf
 fi
+
+if [ "$(dpkg --print-architecture)" != "$ARCH" ] ; then
+   if ! grep -q -- 'FAI_DEBOOTSTRAP_OPTS.*--arch' /etc/grml/fai/make-fai-nfsroot.conf ; then
+      sed -i "s|FAI_DEBOOTSTRAP_OPTS=\"\(.*\)|FAI_DEBOOTSTRAP_OPTS=\"--arch $ARCH \1|" /etc/grml/fai/make-fai-nfsroot.conf
+   fi
+fi
 # }}}
 
 # CHROOT_OUTPUT - execute FAI {{{
@@ -267,6 +276,7 @@ else
    # notice: 'fai dirinstall' does not seem to exit appropriate, so:
    ERROR=''
    if [ -r "/var/log/fai/dirinstall/$HOSTNAME/software.log" ] ; then
+      # 1 errors during executing of commands
       grep 'dpkg: error processing' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=1
       grep 'E: Method http has died unexpectedly!' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=2
       grep 'ERROR: chroot' /var/log/fai/dirinstall/$HOSTNAME/software.log >> $LOGFILE && ERROR=3