diff options
author | Frans Pop <fjp@debian.org> | 2007-11-13 12:50:47 (GMT) |
---|---|---|
committer | Frans Pop <fjp@debian.org> | 2007-11-13 12:50:47 (GMT) |
commit | 1f0be1a85eed8db1cdb34d54bff6d86f8512958a (patch) | |
tree | 576dbe85c2a22a2c04855c99f3391e73968edb96 /debootstrap | |
parent | 5bae6aed48b2289fd00c320ba50baaa2f16c99ab (diff) | |
download | debootstrap-1f0be1a85eed8db1cdb34d54bff6d86f8512958a.zip debootstrap-1f0be1a85eed8db1cdb34d54bff6d86f8512958a.tar.gz debootstrap-1f0be1a85eed8db1cdb34d54bff6d86f8512958a.tar.bz2 |
Also try 'udpkg --print-architecture' in debootstrap when determining the target architecture, which means we don't need to pass it from bootstrap-base
r50117
Diffstat (limited to 'debootstrap')
-rwxr-xr-x | debootstrap | 3 |
1 files changed, 3 insertions, 0 deletions
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 |