summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2008-01-15 11:05:52 +0000
committerColin Watson <cjwatson@debian.org>2008-01-15 11:05:52 +0000
commit3af8fe83f41a58c932ac243ff6a44f1299523bdc (patch)
treeda04ed9980315618b7146cc51b456b0a95feef4c
parentcef7f9fc85975ae12737562566d2b75d918adb6c (diff)
downloaddebootstrap-3af8fe83f41a58c932ac243ff6a44f1299523bdc.tar.gz
* Add minbase variant for Ubuntu gutsy/hardy; see Anthony's change above.
r50881
-rw-r--r--debian/changelog3
-rw-r--r--scripts/ubuntu/gutsy4
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 442eb0a..b8b9824 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ debootstrap (1.0.8) UNRELEASED; urgency=low
[ Stephen R. Marenka ]
* Allow installation of etch-m68k. (Closes: Bug#458965)
+ [ Colin Watson ]
+ * Add minbase variant for Ubuntu gutsy/hardy; see Anthony's change above.
+
-- Anthony Towns <ajt@debian.org> Fri, 07 Dec 2007 18:57:24 +1000
debootstrap (1.0.7) unstable; urgency=low
diff --git a/scripts/ubuntu/gutsy b/scripts/ubuntu/gutsy
index 6c70ba1..9bd08dc 100644
--- a/scripts/ubuntu/gutsy
+++ b/scripts/ubuntu/gutsy
@@ -9,7 +9,7 @@ esac
mirror_style release
download_style apt
finddebs_style from-indices
-variants - buildd fakechroot
+variants - buildd fakechroot minbase
if doing_variant fakechroot; then
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
@@ -27,7 +27,7 @@ work_out_debs () {
base="$(get_debs Priority: important)"
elif doing_variant buildd; then
base="$(get_debs Build-Essential: yes)"
- elif doing_variant fakechroot; then
+ elif doing_variant fakechroot || doing_variant minbase; then
base="apt"
fi
}