X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=147465afa6a2afd528bcfc80b8867bd392c377e8;hp=f3586f9843711366399aca7b46bac2ba6ea1b5bb;hb=134498c077007fa91c198a0fe6354466cb6a5ae7;hpb=2ecc3d3cb6326671abc2e7cd1d132fdd1715528e

diff --git a/grml-debootstrap b/grml-debootstrap
index f3586f9..147465a 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -5,41 +5,40 @@
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2+
 ################################################################################
-# http://www.debian.org/releases/stable/i386/index.html.en
 
 # variables {{{
 PN="$(basename $0)"
-VERSION="$(dpkg --list $PN 2>/dev/null| awk '/^i/ {print $3}')"
+VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")"
 VERSION="${VERSION:-unknown}"
 MNTPOINT="/mnt/debootstrap.$$"
 
 # defaults
-[ -n "$CHROOT_SCRIPTS"] || CHROOT_SCRIPTS='yes'
-[ -n "$CONFFILES"] || CONFFILES='/etc/debootstrap'
-[ -n "$DEBCONF"] || DEBCONF='yes'
-[ -n "$DEBIAN_FRONTEND"] || DEBIAN_FRONTEND='noninteractive'
-[ -n "$DEBOOTSTRAP"] || DEBOOTSTRAP='debootstrap'
-[ -n "$DEFAULT_LOCALES"] || DEFAULT_LOCALES='en_US.UTF-8'
-[ -n "$EXTRAPACKAGES"] || EXTRAPACKAGES='yes'
-[ -n "$FALLBACK_MIRROR"] || FALLBACK_MIRROR='http://http.debian.net/debian'
-[ -n "$FORCE"] || FORCE=''
-[ -n "$HOSTNAME"] || HOSTNAME='grml'
-[ -n "$INITRD"] || INITRD='yes'
-[ -n "$INSTALL_NOTES"] || INSTALL_NOTES='/etc/debootstrap/install_notes'
-[ -n "$LOCALES"] || LOCALES='yes'
-[ -n "$MIRROR"] || MIRROR="$FALLBACK_MIRROR"
-[ -n "$MKFS"] || MKFS='mkfs.ext3'
-[ -n "$PACKAGES"] || PACKAGES='yes'
-[ -n "$PRE_SCRIPTS"] || PRE_SCRIPTS='yes'
-[ -n "$RECONFIGURE"] || RECONFIGURE='console-data'
-[ -n "$RELEASE"] || RELEASE='wheezy'
-[ -n "$RM_APTCACHE"] || RM_APTCACHE='yes'
-[ -n "$SCRIPTS"] || SCRIPTS='yes'
-[ -n "$SECURE"] || SECURE='yes'
-[ -n "$TIMEZONE"] || TIMEZONE='Europe/Vienna'
-[ -n "$TUNE2FS"] || TUNE2FS='tune2fs -c0 -i0'
-[ -n "$UPGRADE_SYSTEM"] || UPGRADE_SYSTEM='yes'
-[ -n "$VMSIZE"] || VMSIZE="2G"
+[ -n "$CHROOT_SCRIPTS" ] || CHROOT_SCRIPTS='yes'
+[ -n "$CONFFILES" ] || CONFFILES='/etc/debootstrap'
+[ -n "$DEBCONF" ] || DEBCONF='yes'
+[ -n "$DEBIAN_FRONTEND" ] || DEBIAN_FRONTEND='noninteractive'
+[ -n "$DEBOOTSTRAP" ] || DEBOOTSTRAP='debootstrap'
+[ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8'
+[ -n "$EXTRAPACKAGES" ] || EXTRAPACKAGES='yes'
+[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://http.debian.net/debian'
+[ -n "$FORCE" ] || FORCE=''
+[ -n "$HOSTNAME" ] || HOSTNAME='grml'
+[ -n "$INITRD" ] || INITRD='yes'
+[ -n "$INSTALL_NOTES" ] || INSTALL_NOTES='/etc/debootstrap/install_notes'
+[ -n "$LOCALES" ] || LOCALES='yes'
+[ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR"
+[ -n "$MKFS" ] || MKFS='mkfs.ext3'
+[ -n "$PACKAGES" ] || PACKAGES='yes'
+[ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes'
+[ -n "$RECONFIGURE" ] || RECONFIGURE='console-data'
+[ -n "$RELEASE" ] || RELEASE='wheezy'
+[ -n "$RM_APTCACHE" ] || RM_APTCACHE='yes'
+[ -n "$SCRIPTS" ] || SCRIPTS='yes'
+[ -n "$SECURE" ] || SECURE='yes'
+[ -n "$TIMEZONE" ] || TIMEZONE='Europe/Vienna'
+[ -n "$TUNE2FS" ] || TUNE2FS='tune2fs -c0 -i0'
+[ -n "$UPGRADE_SYSTEM" ] || UPGRADE_SYSTEM='yes'
+[ -n "$VMSIZE" ] || VMSIZE="2G"
 
 # inside the chroot system locales might not be available, so use minimum:
 export LANG=C
@@ -793,6 +792,16 @@ else
 fi
 # }}}
 
+# It is not possible to build amd64 on i686. {{{
+CURRENT_ARCH="$(uname -m)"
+if [ "$CURRENT_ARCH" != "x86_64" ] ; then
+   if [ "$ARCH" = "amd64" ] ; then
+      eerror "It is not possible to build amd64 on $CURRENT_ARCH." ; eend 1
+      bailout 1
+   fi
+fi
+# }}}
+
 checkconfiguration
 
 # finally make sure at least $TARGET is set [the partition for the new system] {{{