summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-03-01 14:17:09 (GMT)
committerColin Watson <cjwatson@debian.org>2011-03-01 14:17:09 (GMT)
commit7c6cc6ad4e997df510690820206deb5777a7e12b (patch)
treee983331e487b422c0339e2ccba10a8fc588651ad
parent9aa1e76258cdd9c40538ac448fda3df08b15ca22 (diff)
downloaddebootstrap-7c6cc6ad4e997df510690820206deb5777a7e12b.zip
debootstrap-7c6cc6ad4e997df510690820206deb5777a7e12b.tar.gz
debootstrap-7c6cc6ad4e997df510690820206deb5777a7e12b.tar.bz2
For sid and gutsy (a.k.a. natty), install /var/lib/dpkg/info/$(dpkg --print-architecture) -> . symlink, to cope with multiarch dpkg.
-rw-r--r--debian/changelog5
-rw-r--r--scripts/gutsy1
-rw-r--r--scripts/sid1
3 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b18753e..e6b00da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
debootstrap (1.0.29) UNRELEASED; urgency=low
+ [ Joey Hess ]
* Support bootstrapping oldstable. (Lenny could already be bootstrapped
using that suite name.)
+ [ Colin Watson ]
+ * For sid and gutsy (a.k.a. natty), install /var/lib/dpkg/info/$(dpkg
+ --print-architecture) -> . symlink, to cope with multiarch dpkg.
+
-- Joey Hess <joeyh@debian.org> Fri, 25 Feb 2011 16:10:44 -0400
debootstrap (1.0.28) unstable; urgency=low
diff --git a/scripts/gutsy b/scripts/gutsy
index 24c6a3f..307de25 100644
--- a/scripts/gutsy
+++ b/scripts/gutsy
@@ -69,6 +69,7 @@ first_stage_install () {
local ver="$(extract_deb_field "$TARGET/$deb" Version)"
mkdir -p "$TARGET/var/lib/dpkg/info"
+ ln -nsf . "$TARGET/var/lib/dpkg/info/$ARCH"
echo \
"Package: $pkg
diff --git a/scripts/sid b/scripts/sid
index 5febdcc..442755a 100644
--- a/scripts/sid
+++ b/scripts/sid
@@ -58,6 +58,7 @@ first_stage_install () {
local ver="$(extract_deb_field "$TARGET/$deb" Version)"
mkdir -p "$TARGET/var/lib/dpkg/info"
+ ln -nsf . "$TARGET/var/lib/dpkg/info/$ARCH"
echo \
"Package: $pkg