fewer debians (squeeze and wheezy), more ubuntus (oneiric,quantal)

diff --git a/build.common b/build.common
index 228a6ad..74943aa 100644 (file)
--- 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 74261db..d7b2754 100755 (executable)
--- 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 21639a5..c6b38cd 100755 (executable)
--- 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 
 }