Use output of 'dpkg --print-architecture' instead of default $ARCH.

Rename x86 into i386 therefore to keep it clear.

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index decafa1..89cae4d 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -3,7 +3,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: Sat Sep 15 21:56:52 CEST 2007 [mika]
+# Latest change: Sun Sep 16 23:54:07 CEST 2007 [mika]
 ################################################################################
 
 # main output directory
@@ -19,7 +19,13 @@ BUILD_TARGET="$TARGET/grml_cd"
 ISO_TARGET="$TARGET/grml_isos"
 
 # which architecture want to build for now?
-ARCH="x86"
+# defaults to output of 'dpkg --print-architecture'
+# ARCH="i386"
+
+# which Debian suite to you want to use?
+# unless set it defaults to "etch"
+# support values: stable, testing, unstable, etch, lenny, sid
+# SUITE="sid"
 
 # which FAI classes do you want to use by default?
 CLASSES="GRML,I386"

diff --git a/grml-live b/grml-live
index 4240aa1..572ef44 100755 (executable)
--- 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: Sun Sep 16 23:47:55 CEST 2007 [mika]
+# Latest change: Sun Sep 16 23:53:24 CEST 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -162,8 +162,9 @@ fi
 [ -n "$BUILD_TARGET" ] || BUILD_TARGET="$TARGET/grml_cd"
 mkdir -p "$BUILD_TARGET" || bailout 6 "Problem with creating $BUILD_TARGET for stage ARCH"
 
-# x86:
-if [ "$ARCH" = x86 ] ; then
+# i386:
+[ -n "$ARCH" ] || ARCH="$(dpkg --print-architecture)"
+if [ "$ARCH" = i386 ] ; then
    if [ -d "$BUILD_TARGET"/boot/isolinux ] ; then
       echo "  [x] $BUILD_TARGET/boot/isolinux exists already - skipping stage 'boot/isolinux'"
       continue
@@ -177,14 +178,14 @@ if [ "$ARCH" = x86 ] ; then
       cp /usr/lib/syslinux/isolinux.bin                             "$BUILD_TARGET"/boot/isolinux/
       cp /usr/lib/syslinux/memdisk                                  "$BUILD_TARGET"/boot/isolinux/
       cp /usr/lib/syslinux/menu.c32                                 "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/share/grml-live/x86_files/boot/isolinux/allinone.img  "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/share/grml-live/x86_files/boot/isolinux/balder10.imz  "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/share/grml-live/x86_files/boot/isolinux/boot-beep.msg "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/share/grml-live/x86_files/boot/isolinux/boot.msg      "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/share/grml-live/x86_files/boot/isolinux/f*            "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/share/grml-live/x86_files/boot/isolinux/isolinux.cfg  "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/share/grml-live/x86_files/boot/isolinux/logo.16       "$BUILD_TARGET"/boot/isolinux/
-      cp /usr/share/grml-live/x86_files/boot/isolinux/syslinux.cfg  "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/share/grml-live/i386_files/boot/isolinux/allinone.img  "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/share/grml-live/i386_files/boot/isolinux/balder10.imz  "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/share/grml-live/i386_files/boot/isolinux/boot-beep.msg "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/share/grml-live/i386_files/boot/isolinux/boot.msg      "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/share/grml-live/i386_files/boot/isolinux/f*            "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/share/grml-live/i386_files/boot/isolinux/isolinux.cfg  "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/share/grml-live/i386_files/boot/isolinux/logo.16       "$BUILD_TARGET"/boot/isolinux/
+      cp /usr/share/grml-live/i386_files/boot/isolinux/syslinux.cfg  "$BUILD_TARGET"/boot/isolinux/
       # minirt26.gz
       # boot.cat
       if [ -n "$WINDOWS_BINARIES" ] ; then

diff --git a/x86_files/boot/isolinux/allinone.img b/i386_files/boot/isolinux/allinone.img
similarity index 100%
rename from x86_files/boot/isolinux/allinone.img
rename to i386_files/boot/isolinux/allinone.img

diff --git a/x86_files/boot/isolinux/balder10.imz b/i386_files/boot/isolinux/balder10.imz
similarity index 100%
rename from x86_files/boot/isolinux/balder10.imz
rename to i386_files/boot/isolinux/balder10.imz

diff --git a/x86_files/boot/isolinux/boot-beep.msg b/i386_files/boot/isolinux/boot-beep.msg
similarity index 100%
rename from x86_files/boot/isolinux/boot-beep.msg
rename to i386_files/boot/isolinux/boot-beep.msg

diff --git a/x86_files/boot/isolinux/boot.msg b/i386_files/boot/isolinux/boot.msg
similarity index 100%
rename from x86_files/boot/isolinux/boot.msg
rename to i386_files/boot/isolinux/boot.msg

diff --git a/x86_files/boot/isolinux/f10 b/i386_files/boot/isolinux/f10
similarity index 100%
rename from x86_files/boot/isolinux/f10
rename to i386_files/boot/isolinux/f10

diff --git a/x86_files/boot/isolinux/f2 b/i386_files/boot/isolinux/f2
similarity index 100%
rename from x86_files/boot/isolinux/f2
rename to i386_files/boot/isolinux/f2

diff --git a/x86_files/boot/isolinux/f3 b/i386_files/boot/isolinux/f3
similarity index 100%
rename from x86_files/boot/isolinux/f3
rename to i386_files/boot/isolinux/f3

diff --git a/x86_files/boot/isolinux/f4 b/i386_files/boot/isolinux/f4
similarity index 100%
rename from x86_files/boot/isolinux/f4
rename to i386_files/boot/isolinux/f4

diff --git a/x86_files/boot/isolinux/f5 b/i386_files/boot/isolinux/f5
similarity index 100%
rename from x86_files/boot/isolinux/f5
rename to i386_files/boot/isolinux/f5

diff --git a/x86_files/boot/isolinux/f6 b/i386_files/boot/isolinux/f6
similarity index 100%
rename from x86_files/boot/isolinux/f6
rename to i386_files/boot/isolinux/f6

diff --git a/x86_files/boot/isolinux/f7 b/i386_files/boot/isolinux/f7
similarity index 100%
rename from x86_files/boot/isolinux/f7
rename to i386_files/boot/isolinux/f7

diff --git a/x86_files/boot/isolinux/f8 b/i386_files/boot/isolinux/f8
similarity index 100%
rename from x86_files/boot/isolinux/f8
rename to i386_files/boot/isolinux/f8

diff --git a/x86_files/boot/isolinux/f9 b/i386_files/boot/isolinux/f9
similarity index 100%
rename from x86_files/boot/isolinux/f9
rename to i386_files/boot/isolinux/f9

diff --git a/x86_files/boot/isolinux/isolinux.cfg b/i386_files/boot/isolinux/isolinux.cfg
similarity index 100%
rename from x86_files/boot/isolinux/isolinux.cfg
rename to i386_files/boot/isolinux/isolinux.cfg

diff --git a/x86_files/boot/isolinux/logo.16 b/i386_files/boot/isolinux/logo.16
similarity index 100%
rename from x86_files/boot/isolinux/logo.16
rename to i386_files/boot/isolinux/logo.16

diff --git a/x86_files/boot/isolinux/syslinux.cfg b/i386_files/boot/isolinux/syslinux.cfg
similarity index 100%
rename from x86_files/boot/isolinux/syslinux.cfg
rename to i386_files/boot/isolinux/syslinux.cfg