From 10f73bfa4aece7707f48379b82e5858d1909d98f Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Thu, 30 Aug 2012 11:02:24 -0500 Subject: [PATCH] lxc-ubuntu-cloud: get full pathname to userdata file When passing '--userdata somefile' to the ubuntu-cloud template, a user may pass a relative pathname. The template uses the filename after changing current directory, so store the full pathname for the userdata file instead of a potential relative pathname. Signed-off-by: Serge Hallyn --- templates/lxc-ubuntu-cloud.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in index 1d3ed8392..ab8040f2d 100644 --- a/templates/lxc-ubuntu-cloud.in +++ b/templates/lxc-ubuntu-cloud.in @@ -221,9 +221,13 @@ if [ "$stream" != "daily" -a "$stream" != "released" ]; then exit 1 fi -if [ -n "$userdata" -a ! -f "$userdata" ]; then - echo "Userdata does not exist" - exit 1 +if [ -n "$userdata" ]; then + if [ ! -f "$userdata" ]; then + echo "Userdata ($userdata) does not exist" + exit 1 + else + userdata=`readlink -f $userdata` + fi fi if [ -z "$path" ]; then