Description: Fix handling of user-data in ubuntu-cloud template

Signed-off-by: Ben Howard <ben.howard@canonical.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-cloud.in b/templates/lxc-ubuntu-cloud.in
index 805f5ae42358a39d726f52c1ada617bd50c0e31d..79d10c8d12a84d5fe7466a513744dbb161f88337 100644 (file)
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -117,7 +117,7 @@ EOF
     return 0
 }
 
-options=$(getopt -o a:hp:r:n:Fi:CLS:T:ds: -l arch:,help,path:,release:,name:,flush-cache,hostid:,auth-key:,cloud,no_locales,tarball:,debug,stream: -- "$@")
+options=$(getopt -o a:hp:r:n:Fi:CLS:T:ds: -l arch:,help,path:,release:,name:,flush-cache,hostid:,auth-key:,cloud,no_locales,tarball:,debug,stream:,userdata: -- "$@")
 if [ $? -ne 0 ]; then
     usage $(basename $0)
     exit 1
@@ -207,6 +207,11 @@ if [ "$stream" != "daily" -a "$stream" != "released" ]; then
     exit 1
 fi
 
+if [ -n "$userdata" -a ! -f "$userdata" ]; then
+    echo "Userdata does not exist"
+    exit 1
+fi
+
 if [ -z "$path" ]; then
     echo "'path' parameter is required"
     exit 1
@@ -322,8 +327,9 @@ EOF
                echo "Inserted SSH public key from $auth_key into /home/ubuntu/.ssh/authorized_keys"
        fi
 
-       if [ ! -f $userdata ]; then
-               cp $userdata $data_d/user-data
+       if [ -f "$userdata" ]; then
+               echo "Using custom user-data"
+               cp $userdata $seed_d/user-data
        else
 
                if [ -z "$MIRROR" ]; then
@@ -337,7 +343,6 @@ apt-mirror: $MIRROR
 manage_etc_hosts: localhost
 locale: $(/usr/bin/locale | awk -F= '/LANG=/ {print$NF}')
 EOF
-
        fi
 
        chroot $rootfs /usr/sbin/usermod -U ubuntu