X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-live;h=2dd904095bbdd85779a1f4ebd6bcc04928debf3a;hb=472474cceb42145464cbfc59d751f6277e5253aa;hp=40f3cebb08bf8db5297cfa7ac3f4bf6b0c5865e9;hpb=416c56c5eb524416159001cc975e1cb88226d341;p=grml-live.git diff --git a/grml-live b/grml-live index 40f3ceb..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