summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@err.no>2013-12-19 12:45:10 (GMT)
committerTollef Fog Heen <tfheen@err.no>2013-12-19 12:45:10 (GMT)
commit299a5cc6a647fa2a176b12a5314fc8bbb7be1d1b (patch)
tree52657a312f19f8c965ca56fb8a22329b39d49aee
parentc3ab42b4c7d3880b97af8172177a26a7c5b2c8fb (diff)
downloaddebootstrap-299a5cc6a647fa2a176b12a5314fc8bbb7be1d1b.zip
debootstrap-299a5cc6a647fa2a176b12a5314fc8bbb7be1d1b.tar.gz
debootstrap-299a5cc6a647fa2a176b12a5314fc8bbb7be1d1b.tar.bz2
Install base-passwd and base-files in two calls
-rw-r--r--debian/changelog9
-rw-r--r--scripts/gutsy3
-rw-r--r--scripts/sid3
3 files changed, 13 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index d5520b5..e9a72f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debootstrap (1.0.56) UNRELEASED; urgency=low
+
+ * Install base-passwd and base-files in two calls rather than one to
+ avoid problems with home-built media with different ordering in
+ Packages. Thanks to Jo Shields for pointing this out and providing
+ the workaround. Closes: #601670. LP: #1001131.
+
+ -- Tollef Fog Heen <tfheen@debian.org> Thu, 19 Dec 2013 13:41:37 +0100
+
debootstrap (1.0.55) unstable; urgency=low
[ Matthias Klose ]
diff --git a/scripts/gutsy b/scripts/gutsy
index 992d605..597562c 100644
--- a/scripts/gutsy
+++ b/scripts/gutsy
@@ -106,7 +106,8 @@ second_stage_install () {
p; progress $baseprog $bases INSTCORE "Installing core packages" #2
ln -sf mawk "$TARGET/usr/bin/awk"
- x_core_install base-files base-passwd
+ x_core_install base-passwd
+ x_core_install base-files
p; progress $baseprog $bases INSTCORE "Installing core packages" #3
x_core_install dpkg
diff --git a/scripts/sid b/scripts/sid
index 0e2c12d..70ae207 100644
--- a/scripts/sid
+++ b/scripts/sid
@@ -98,7 +98,8 @@ second_stage_install () {
p; progress $baseprog $bases INSTCORE "Installing core packages" #2
ln -sf mawk "$TARGET/usr/bin/awk"
- x_core_install base-files base-passwd
+ x_core_install base-passwd
+ x_core_install base-files
p; progress $baseprog $bases INSTCORE "Installing core packages" #3
x_core_install dpkg