summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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