From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Sat, 25 Jun 2011 13:17:47 +0000 (+0200)
Subject: lxc-ubuntu: Default to current ubuntu release.
X-Git-Tag: lxc-0.7.5~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6992ecf0d9a452c1119d56b173859fba76ac713;p=thirdparty%2Flxc.git

lxc-ubuntu: Default to current ubuntu release.

If can't match any valid release, use lucid.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/templates/lxc-ubuntu.in b/templates/lxc-ubuntu.in
index 0a55f4cd5..439e1d0c5 100644
--- a/templates/lxc-ubuntu.in
+++ b/templates/lxc-ubuntu.in
@@ -391,6 +391,15 @@ fi
 eval set -- "$options"
 
 release=lucid
+if [ -f /etc/lsb-release ]; then
+    . /etc/lsb-release
+    case "$DISTRIB_CODENAME" in
+        lucid|maverick|natty|oneiric)
+            release=$DISTRIB_CODENAME
+        ;;
+    esac
+fi
+
 bindhome=
 arch=$(arch)