Merge lp:~raharper/cloud-utils/trunk.fix-lp1604011 into lp:cloud-utils

[Ryan Harper]

bin/mount-image-callback: cleanup getopt short options configuration

The short options were not configured properlty. The '-m' and '-P'
options require input values but this was not indicated as required with
the ':' value in the short opts string. The case-statement parsing
options used '-O' as accepted short option, but this was not advertised
in the Usage statement, so remove the acceptance.

=== modified file 'bin/mount-image-callback'
--- bin/mount-image-callback	2016-01-27 17:53:13 +0000
+++ bin/mount-image-callback	2016-07-18 14:23:23 +0000
@@ -144,7 +144,7 @@
 	local cd_mountpoint=false fmt="" mp_is_tmp=false overlay=false
 	local img_mp="" workd=""
 
-	short_opts="CdhmPpsv"
+	short_opts="Cdhm:P:psv"
 	long_opts="cd-mountpoint,dev,help,format:,mountpoint:,overlay,partition:,proc,read-only,sys,system-mounts,system-resolvconf,verbose"
 	getopt_out=$(getopt --name "${0##*/}" \
 		--options "${short_opts}" --long "${long_opts}" -- "$@") &&
@@ -160,7 +160,7 @@
 			-h|--help) Usage ; exit 0;;
 			-m|--mountpoint) mp=$next;;
 			-P|--partition) ptnum=$next;;
-			-O|--overlay) overlay=true;;
+			   --overlay) overlay=true;;
 			-p|--proc) bmounts="${bmounts:+${bmounts} }/proc";;
 			-s|--sys) bmounts="${bmounts:+${bmounts} }/sys";;
 			   --system-mounts) bmounts="/dev /proc /sys";;