X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=89b5adcc8c0bb2894249ea85de13f794ceeb0a29;hp=06632cd9793cfeb99cbb027df11f0e33ea7798e2;hb=344f0e99017fdc780208fc661621522f579a6ba4;hpb=f831c79a2fda02d9246695dda957aae9b3d64438 diff --git a/grml-debootstrap b/grml-debootstrap index 06632cd..89b5adc 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -704,7 +704,7 @@ Is this ok for you? Notice: selecting 'No' will exit ${PN}." [ $? -eq 0 ] || bailout 0 else # if not running automatic installation display configuration and prompt for execution: - einfo "$PN - Please recheck configuration before execution:" + einfo "$PN [${VERSION}] - Please recheck configuration before execution:" echo echo " Target: $TARGET" @@ -774,6 +774,17 @@ if [ -z "$TARGET" -o -n "$INTERACTIVE" ] ; then fi # }}} +# architecture setup {{{ +if [ -n "$ARCH" ] ; then + ARCHCMD="--arch $ARCH" + ARCHINFO=" (${ARCH})" +else + ARCH="$(dpkg --print-architecture)" + ARCHCMD="--arch $ARCH" + ARCHINFO=" (${ARCH})" +fi +# }}} + checkconfiguration # finally make sure at least $TARGET is set [the partition for the new system] {{{ @@ -825,17 +836,6 @@ else fi # }}} -# architecture setup {{{ -if [ -n "$ARCH" ] ; then - ARCHCMD="--arch $ARCH" - ARCHINFO=" (${ARCH})" -else - ARCH="$(dpkg --print-architecture)" - ARCHCMD="--arch $ARCH" - ARCHINFO=" (${ARCH})" -fi -# }}} - # make sure we have the right syntax when using an iso image {{{ if [ -n "$ISO" ] ; then case $ISO in