From d550087214840a193f6efe8451ee60348ffbf480 Mon Sep 17 00:00:00 2001
From: Nikhil Manchanda <SlickNik@gmail.com>
Date: Wed, 11 Jun 2014 16:03:47 -0700
Subject: [PATCH] Do not use DatasourceNone for precise cloud-init

The 'None' Datasource does not exist in precise 12.04 (which uses
cloud-init 0.6.3), so conditionally ensure that we are not including
this in the datasource_list in case we're building a precise image.

Partial-bug: 1329068
Change-Id: I6efb91e17bf896bbf7d67c31c4eb5098d5d61a71
---
 .../install.d/05-set-cloud-init-sources                | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources b/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
index 4f88ad95..ad4d5b20 100755
--- a/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
+++ b/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
@@ -11,6 +11,14 @@ if [ -z "$DIB_CLOUD_INIT_DATASOURCES" ] ; then
     exit 1
 fi
 
-cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
+# DatasourceNone doesn't exist in Ubuntu 12.04 (Precise)
+# which uses cloud-init version 0.6.3
+if [ "$(lsb_release -cs)" = 'precise' ] ; then
+    cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
+datasource_list: [  $DIB_CLOUD_INIT_DATASOURCES ]
+EOF
+else
+    cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
 datasource_list: [  $DIB_CLOUD_INIT_DATASOURCES, None ]
 EOF
+fi