From e8d51a5a15aad719d27399b185454d1a41628eba Mon Sep 17 00:00:00 2001
From: Axel Beckert <abe@deuxchevaux.org>
Date: Fri, 17 Jul 2015 22:07:37 +0200
Subject: [PATCH] Support oldstable and oldoldstable as distribution name, too

Notice: "oldoldstable" is not yet supported by debootstrap, see

Also mention Debian's LTS in TODO.md wrt. distribution.conf
---
 Makefile               |  2 ++
 TODO.markdown          |  2 +-
 debian/changelog       |  2 ++
 etc/distributions.conf | 65 +++++++++++++++++++++---------------------
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index 574ceb8..4660a96 100644
--- a/Makefile
+++ b/Makefile
@@ -184,6 +184,8 @@ install-hooks:
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d sid.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d testing.d
 	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d stable.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d oldstable.d
+	-cd ${prefix}/usr/share/xen-tools/ && ln -s debian.d oldoldstable.d
 	mkdir -p ${prefix}/usr/share/xen-tools/gentoo.d/
 	cp -R hooks/gentoo/*-* ${prefix}/usr/share/xen-tools/gentoo.d
 	mkdir -p ${prefix}/usr/share/xen-tools/dapper.d/
diff --git a/TODO.markdown b/TODO.markdown
index 49df8b5..172f637 100644
--- a/TODO.markdown
+++ b/TODO.markdown
@@ -68,7 +68,7 @@ Bugs to fix and features to add for 5.0
 * `xen-create-image --dist=…` / sources.list generation should be more fine-grained
 
   xen-tools should offer the possibility to enable/disable
-  security/volatile/backports as well as
+  security/volatile/backports/lts as well as
   contrib/non-free/universe/restricted/multiverse for each of them not
   only based on defaults plus the Dom0's sources.list
 
diff --git a/debian/changelog b/debian/changelog
index 40b3551..602bbe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium
       - Make "release" target to include "orig-tar-gz" and tagging.
     + New option --keyring which is passed through to deboootstrap. Its
       default values work around bug #792729 in debootstrap.
+    + Supports "oldstable" and "oldoldstable" as distribution names, too.
+      ("oldoldstable" is not yet supported by debootstrap, see #792734.)
   * Update Vcs-* headers and documentation as Gitorious closed its doors
     in June 2015 and is now only available with static contents.
   * Recommend debian-archive-keyring (for installing Debian DomUs on
diff --git a/etc/distributions.conf b/etc/distributions.conf
index bee5b27..6213286 100644
--- a/etc/distributions.conf
+++ b/etc/distributions.conf
@@ -7,37 +7,38 @@
 # Known distributions: debian, ubuntu
 # Known keywords: eol, pygrub
 #
-sarge     = debian eol
-etch      = debian eol
-lenny     = debian eol
-squeeze   = debian
-wheezy    = debian
-jessie    = debian
-stretch   = debian
-sid       = debian
+sarge        = debian eol
+etch         = debian eol
+lenny        = debian eol
+squeeze      = debian
+wheezy       = debian
+jessie       = debian
+stretch      = debian
+sid          = debian
 
-testing   = debian
-oldstable = debian
-stable    = debian
-unstable  = debian
+testing      = debian
+oldoldstable = debian
+oldstable    = debian
+stable       = debian
+unstable     = debian
 
-dapper    = ubuntu eol
-edgy      = ubuntu eol
-feisty    = ubuntu eol
-gutsy     = ubuntu eol
-hardy     = ubuntu eol
-intrepid  = ubuntu eol
-jaunty    = ubuntu eol
-karmic    = ubuntu eol
-lucid     = ubuntu eol pygrub
-maverick  = ubuntu eol pygrub
-natty     = ubuntu eol pygrub
-oneiric   = ubuntu eol pygrub
-precise   = ubuntu     pygrub
-quantal   = ubuntu eol pygrub
-raring    = ubuntu eol pygrub
-saucy     = ubuntu eol pygrub
-trusty    = ubuntu     pygrub
-utopic    = ubuntu eol pygrub
-vivid     = ubuntu     pygrub
-wily      = ubuntu     pygrub
+dapper       = ubuntu eol
+edgy         = ubuntu eol
+feisty       = ubuntu eol
+gutsy        = ubuntu eol
+hardy        = ubuntu eol
+intrepid     = ubuntu eol
+jaunty       = ubuntu eol
+karmic       = ubuntu eol
+lucid        = ubuntu eol pygrub
+maverick     = ubuntu eol pygrub
+natty        = ubuntu eol pygrub
+oneiric      = ubuntu eol pygrub
+precise      = ubuntu     pygrub
+quantal      = ubuntu eol pygrub
+raring       = ubuntu eol pygrub
+saucy        = ubuntu eol pygrub
+trusty       = ubuntu     pygrub
+utopic       = ubuntu eol pygrub
+vivid        = ubuntu     pygrub
+wily         = ubuntu     pygrub