summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoey Hess <joeyh@debian.org>2010-02-17 21:06:27 (GMT)
committerJoey Hess <joeyh@debian.org>2010-02-17 21:06:27 (GMT)
commitbe7a6af491ac50aae885a8a3188f7576bba24861 (patch)
tree87995de62b1ff22b603d7b5479b08e0fcd03857c
parent6d37094ebc77409bd0b7333964ba33cf561b94e1 (diff)
downloaddebootstrap-be7a6af491ac50aae885a8a3188f7576bba24861.zip
debootstrap-be7a6af491ac50aae885a8a3188f7576bba24861.tar.gz
debootstrap-be7a6af491ac50aae885a8a3188f7576bba24861.tar.bz2
Allow the suite to be stable, testing, or unstable when debootstrapping Debian. Closes: #288109
This relies on the stable, testing, and unstable symlinks on the mirrors to work. Ubuntu doesn't have such symlinks, or really use corresponding names for its suites, so this is Debian-only. r62294
-rw-r--r--Makefile8
-rw-r--r--debian/changelog4
-rw-r--r--debootstrap.82
3 files changed, 12 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bb2232d..65b6d8e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,18 @@ install:
install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
install -o root -g root -m 0644 functions $(DSDIR)/
- # no special script for etch anymore
+ # recent debian releases can all be handled by the sid script
ln -s sid $(DSDIR)/scripts/etch
ln -s sid $(DSDIR)/scripts/etch-m68k
ln -s sid $(DSDIR)/scripts/lenny
ln -s sid $(DSDIR)/scripts/squeeze
+
+ # allow using symbolic release names instead of code names too
+ ln -s sid $(DSDIR)/scripts/stable
+ ln -s sid $(DSDIR)/scripts/testing
+ ln -s sid $(DSDIR)/scripts/unstable
+ # recent ubuntu releases can all be handled by the gutsy script
ln -s gutsy $(DSDIR)/scripts/hardy
ln -s gutsy $(DSDIR)/scripts/intrepid
ln -s gutsy $(DSDIR)/scripts/jaunty
diff --git a/debian/changelog b/debian/changelog
index 4320973..2fba951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,10 @@ debootstrap (1.0.21) UNRELEASED; urgency=low
* Apply patch from Andres Salomon <dilinger@collabora.co.uk> to fix
iteration through components in download_main (closes: #561298).
+ [ Joey Hess ]
+ * Allow the suite to be stable, testing, or unstable when debootstrapping
+ Debian. Closes: #288109
+
-- Frans Pop <fjp@debian.org> Sun, 27 Dec 2009 18:51:06 +0100
debootstrap (1.0.20) unstable; urgency=low
diff --git a/debootstrap.8 b/debootstrap.8
index 4c4f4f1..5c436ee 100644
--- a/debootstrap.8
+++ b/debootstrap.8
@@ -15,7 +15,7 @@ debootstrap \- Bootstrap a basic Debian system
.B debootstrap
bootstraps a basic Debian system of
.I SUITE
-(eg, lenny, squeeze, sid) into
+(eg, lenny, squeeze, sid; or stable, testing, unstable) into
.I TARGET
from
.I MIRROR