Improve check for architecture

diff --git a/debian/changelog b/debian/changelog
index 539437f..5b65d34 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ grml-live (0.9.21) UNRELEASED; urgency=low
     if not specified.
   * Set UTC=no by default. See http://bts.grml.org/grml/issue708 for
     details. Credits to Ulrich Zehl for debugging. [Closes: issue708]
     if not specified.
   * Set UTC=no by default. See http://bts.grml.org/grml/issue708 for
     details. Credits to Ulrich Zehl for debugging. [Closes: issue708]

+  * Improve check for architecture which should be build: if not specified
+    assume a safe default and check this one.

   * Software related changes:
     - Add git-email to GRML_FULL (thanks to Joerg Woelke for mentioning).
     - Add aesfix, aeskeyfind, bios-memimage, chaosreader, ext3grep, fatback,
   * Software related changes:
     - Add git-email to GRML_FULL (thanks to Joerg Woelke for mentioning).
     - Add aesfix, aeskeyfind, bios-memimage, chaosreader, ext3grep, fatback,


@@ -39,7 +41,7 @@ grml-live (0.9.21) UNRELEASED; urgency=low
     isolinux.cfg, syslinux.cfg with each other; provide a fallback
     way to boot MirOS bsd4grml from both GRUB versions using modules
 
     isolinux.cfg, syslinux.cfg with each other; provide a fallback
     way to boot MirOS bsd4grml from both GRUB versions using modules
 

- -- Michael Prokop <mika@grml.org>  Sun, 16 Aug 2009 14:07:11 +0200
+ -- Michael Prokop <mika@grml.org>  Sun, 16 Aug 2009 14:23:16 +0200

 
 grml-live (0.9.20) unstable; urgency=low
 
 
 grml-live (0.9.20) unstable; urgency=low
 

diff --git a/grml-live b/grml-live
index 40f3ceb..2dd9040 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -416,6 +416,9 @@ if [ -n "$SUITE" ] ; then
    done
 fi
 
    done
 fi
 

+# set $ARCH
+[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"
+

 # validate whether the specified architecture class matches the
 # architecture (option), otherwise installation of kernel will fail
 if echo $CLASSES | grep -qi i386 ; then
 # validate whether the specified architecture class matches the
 # architecture (option), otherwise installation of kernel will fail
 if echo $CLASSES | grep -qi i386 ; then


@@ -432,8 +435,6 @@ elif echo $CLASSES | grep -qi amd64 ; then
    fi
 fi
 
    fi
 fi
 

-# set $ARCH
-[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"

 if grep -q -- 'FAI_DEBOOTSTRAP_OPTS.*--arch' "$NFSROOT_CONF" ; then
    sed "s/--arch [a-z0-9]* /--arch $ARCH /" "$NFSROOT_CONF" | sponge "$NFSROOT_CONF"
 else
 if grep -q -- 'FAI_DEBOOTSTRAP_OPTS.*--arch' "$NFSROOT_CONF" ; then
    sed "s/--arch [a-z0-9]* /--arch $ARCH /" "$NFSROOT_CONF" | sponge "$NFSROOT_CONF"
 else