X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=2dd904095bbdd85779a1f4ebd6bcc04928debf3a;hb=472474cceb42145464cbfc59d751f6277e5253aa;hp=f10006637bd37a41b548b08e863a070c8ff58422;hpb=339590e244585c5334c41250b10abdc01e732a17;p=grml-live.git

diff --git a/grml-live b/grml-live
index f100066..2dd9040 100755
--- a/grml-live
+++ b/grml-live
@@ -416,6 +416,9 @@ if [ -n "$SUITE" ] ; then
    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
@@ -432,8 +435,6 @@ elif echo $CLASSES | grep -qi amd64 ; then
    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
@@ -447,11 +448,11 @@ if [ -n "$BUILD_DIRTY" ]; then
 else
    [ -n "$CHROOT_OUTPUT" ] || CHROOT_OUTPUT="$OUTPUT/grml_chroot"
 
-   # inform fai about the suite we build
-   if [ -n "$SUITE" ] ; then
-      [ -d "$CHROOT_OUTPUT/etc/grml" ] || mkdir -p "$CHROOT_OUTPUT/etc/grml"
-      echo "SUITE=$SUITE" > "$CHROOT_OUTPUT/etc/grml/grml-live-build-info"
-   fi
+   # provide inform fai about the ISO we build
+   [ -d "$CHROOT_OUTPUT/etc/" ] || mkdir -p "$CHROOT_OUTPUT/etc/"
+   echo '# This file has been generated by grml-live.' > "$CHROOT_OUTPUT/etc/grml_live_version"
+   [ -n "$GRML_LIVE_VERSION" ] && echo "GRML_LIVE_VERSION=$GRML_LIVE_VERSION" >> "$CHROOT_OUTPUT/etc/grml_live_version"
+   [ -n "$SUITE" ] && echo "SUITE=$SUITE" >> "$CHROOT_OUTPUT/etc/grml_live_version"
 
    if [ -n "$UPDATE" -o -n "$BUILD_ONLY" ] ; then
       FAI_ACTION=softupdate