From 6b1a07ba086d16cfa822caadf95eab62b70889cd Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Mon, 26 Nov 2012 14:08:36 -0600 Subject: [PATCH] fix lxc-ubuntu-cloud option parsing bugs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The -u shortopt matching --userdata was not specified, and when -L is found shift should have been by 1 not 2 since there is no optarg. Signed-off-by: Serge Hallyn Acked-by: Stéphane Graber --- templates/lxc-ubuntu-cloud.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in index 8df05da11..300b47dd5 100644 --- a/templates/lxc-ubuntu-cloud.in +++ b/templates/lxc-ubuntu-cloud.in @@ -131,7 +131,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:,userdata: -- "$@") +options=$(getopt -o a:hp:r:n:Fi:CLS:T:ds:u: -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 @@ -189,7 +189,7 @@ do -u|--userdata) userdata=$2; shift 2;; -C|--cloud) cloud=1; shift 1;; -S|--auth-key) auth_key=$2; shift 2;; - -L|--no_locales) locales=0; shift 2;; + -L|--no_locales) locales=0; shift 1;; -T|--tarball) tarball=$2; shift 2;; -d|--debug) debug=1; shift 1;; -s|--stream) stream=$2; shift 2;;