diff options
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | debootstrap | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 891ef5b..39a32f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,15 @@ debootstrap (1.0.7) UNRELEASED; urgency=low * No longer include full devices tarball in udeb. + * Also try 'udpkg --print-architecture' when determining the target + architecture. * Utility pkgdetails moved from debootstrap-udeb to bootstrap-base so that the udeb can become 'Architecture: all'. * Use tab indentation in debootstrap and functions saving 3kB (relevant for Debian Installer). * Changes in udeb require base-installer 1.85. - -- Frans Pop <fjp@debian.org> Tue, 13 Nov 2007 13:21:38 +0100 + -- Frans Pop <fjp@debian.org> Tue, 13 Nov 2007 13:42:30 +0100 debootstrap (1.0.6) unstable; urgency=low diff --git a/debootstrap b/debootstrap index fc2b677..ee367af 100755 --- a/debootstrap +++ b/debootstrap @@ -295,6 +295,9 @@ if [ "$ARCH" != "" ]; then elif [ -x /usr/bin/dpkg ] && \ /usr/bin/dpkg --print-installation-architecture >/dev/null 2>&1; then ARCH=`/usr/bin/dpkg --print-installation-architecture` +elif type udpkg >/dev/null 2>&1 && \ + udpkg --print-architecture >/dev/null 2>&1; then + ARCH=`/usr/bin/udpkg --print-architecture` elif [ -e $DEBOOTSTRAP_DIR/arch ]; then ARCH=`cat $DEBOOTSTRAP_DIR/arch` else |