From 5f2b591bc1015685ebccd820f415e2476cf579c3 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 18 Jan 2013 18:38:38 +0100
Subject: [PATCH] ubuntu ctd

---
 build.common           |  2 +-
 vbuild-init-vserver.sh | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/build.common b/build.common
index 9fc1f3d7..bd689b6d 100644
--- a/build.common
+++ b/build.common
@@ -63,7 +63,7 @@ function pl_getReleaseName () {
 	[Ss]L*)
 	    releasename=sl$release
 	    ;;
-	squeeze|wheezy|oreinic|precise|quantal)
+	squeeze|wheezy|oneiric|precise|quantal)
 	    releasename=$distro
 	    ;;
 	*)
diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index 07b426b6..40f4d39e 100755
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -334,11 +334,18 @@ function devel_or_vtest_tools () {
 	    # handle this one firt off to be sure 
 	    $personality vserver $vserver exec apt-get install -y locales
 	    # all in a single batch 
-	    $personality vserver $vserver exec apt-get install -y --ignore-missing $packages
+	    [ -n "$packages" ] $personality vserver $vserver exec apt-get install -y --ignore-missing $packages || :
+	    # of course, on ubuntu apt-get --ignore-missing .. does not ignore missing packages !
 	    # check it up a bit 
 	    for package in $packages ; do 
-		$personality vserver $vserver exec dpkg -l $package >& /dev/null || \
-		    { echo "WARNING - missing package on debian $package - ignored" ; true; }
+		if ! $personality vserver $vserver exec dpkg -l $package >& /dev/null ; then
+		    # try to install it individually - so this is for ubuntu
+		    $personality vserver $vserver exec apt-get install -y $package || :
+		    # still not there ?
+		    if ! $personality vserver $vserver exec dpkg -l $package >& /dev/null ; then
+			echo "WARNING - missing package on debian $package - ignored" 
+		    fi
+		fi
 	    done
 	    ### xxx todo install groups with apt..
 	    ;;
-- 
2.43.0