From 9f9c63a00d4b23b54b4b2ab3ef4c3efe048cd84e Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 18 Jan 2013 14:48:07 +0100
Subject: [PATCH] fewer debians (squeeze and wheezy), more ubuntus
 (oneiric,quantal)

---
 build.common           | 4 ++--
 pkgs.py                | 5 ++++-
 vbuild-init-vserver.sh | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.common b/build.common
index 228a6ad2..74943aa0 100644
--- a/build.common
+++ b/build.common
@@ -21,7 +21,7 @@ function pl_getDistro() {
 	case $(cat /etc/debian_version) in
 	    6.0.6) distro=squeeze ;;
 	    7.0)   distro=wheezy  ;;
-	    *)	   distro=unknown.debian.in.ubild.common ;;
+	    *)	   distro=unknown.debian.in.build.common ;;
 	esac
     fi
     [ -z "$distro" ] && { echo "build.common.pl_getDistro-unknown"; exit 1; }
@@ -60,7 +60,7 @@ function pl_getReleaseName () {
 	[Ss]L*)
 	    releasename=sl$release
 	    ;;
-	lenny|squeeze|wheezy|jessie)
+	squeeze|wheezy|oneiric|quantal)
 	    releasename=$distro
 	    ;;
 	*)
diff --git a/pkgs.py b/pkgs.py
index 74261db9..d7b2754b 100755
--- a/pkgs.py
+++ b/pkgs.py
@@ -37,7 +37,10 @@ default_fcdistro='f14'
 known_fcdistros = [ 'centos5','centos6',
                     'f8', 'f10','f12', 'f14', 'f16', 'f17',
                     'sl6', 
-                    'lenny','squeeze','wheezy','jessie' ]
+                    # debians
+                    'squeeze','wheezy',
+                    # ubuntus
+                    'oneiric', 'quantal' ]
 default_pldistro='onelab'
 
 known_keywords=['groupname', 'groupdesc', 
diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 21639a59..c6b38cdf 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -85,7 +85,7 @@ function package_method () {
     fcdistro=$1; shift
     case $fcdistro in
 	f[0-9]*|centos[0-9]*|sl[0-9]*) echo yum ;;
-	lenny|squeeze|wheezy|jessie) echo debootstrap ;;
+	squeeze|wheezy|oneiric|quantal) echo debootstrap ;;
 	*) echo Unknown distro $fcdistro ;;
     esac 
 }
-- 
2.43.0