Merge lp:~darkmuggle-deactivatedaccount/lxc/ubuntu-cloud-template_lp977376 into lp:ubuntu/precise/lxc

[Ben Howard]

Fixes userdata handling of ubuntu-cloud tempate LP: 977376

[lp:~darkmuggle-deactivatedaccount/lxc/ubuntu-cloud-template_lp977376]

92. By Ben Howard on 2012-04-09

Fixed ubuntu-cloud template user-data handling (LP: 977376)

Unmerged revisions

92. By Ben Howard on 2012-04-09

Fixed ubuntu-cloud template user-data handling (LP: 977376)

91. By Stéphane Graber on 2012-04-03

Add missing space after lxc.network.hwaddr

=== modified file 'templates/lxc-ubuntu-cloud.in'
--- templates/lxc-ubuntu-cloud.in	2012-04-03 02:22:04 +0000
+++ templates/lxc-ubuntu-cloud.in	2012-04-09 17:43:33 +0000
@@ -119,7 +119,7 @@
     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
@@ -209,6 +209,11 @@
     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
@@ -324,8 +329,9 @@
 		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
@@ -339,7 +345,6 @@
 manage_etc_hosts: localhost
 locale: $(/usr/bin/locale | awk -F= '/LANG=/ {print$NF}')
 EOF
-
 	fi
 
     	chroot $rootfs /usr/sbin/usermod -U ubuntu