Merge pull request #406 from joshix/doubledash0

Josh Wood · Josh Wood · commit 0fd3cd2fae2b · 2015-11-10T10:21:06.000-08:00
Vmware-guestinfo: Double hyphen long options.
diff --git a/Documentation/vmware-guestinfo.md b/Documentation/vmware-guestinfo.md
@@ -3,7 +3,7 @@
 ## Cloud-Config VMWare Guestinfo Variables
 
 coreos-cloudinit accepts configuration from the VMware RPC API's *guestinfo*
-facility. This datasource can be enabled with the `-from-vmware-guestinfo`
+facility. This datasource can be enabled with the `--from-vmware-guestinfo`
 flag to coreos-cloudinit.
 
 The following guestinfo variables are recognized and processed by cloudinit
diff --git a/coreos-cloudinit.go b/coreos-cloudinit.go
@@ -169,7 +169,7 @@ func main() {
 
 	dss := getDatasources()
 	if len(dss) == 0 {
-		fmt.Println("Provide at least one of -from-file, -from-configdrive, -from-ec2-metadata, -from-cloudsigma-metadata, -from-packet-metadata, -from-digitalocean-metadata, -from-vmware-guestinfo, -from-waagent, -from-url or -from-proc-cmdline")
+		fmt.Println("Provide at least one of --from-file, --from-configdrive, --from-ec2-metadata, --from-cloudsigma-metadata, --from-packet-metadata, --from-digitalocean-metadata, --from-vmware-guestinfo, --from-waagent, --from-url or --from-proc-cmdline")
 		os.Exit(2)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func main() {`
`169`	`169`
`170`	`170`	`dss := getDatasources()`
`171`	`171`	`if len(dss) == 0 {`
`172`		`- fmt.Println("Provide at least one of -from-file, -from-configdrive, -from-ec2-metadata, -from-cloudsigma-metadata, -from-packet-metadata, -from-digitalocean-metadata, -from-vmware-guestinfo, -from-waagent, -from-url or -from-proc-cmdline")`
	`172`	`+ fmt.Println("Provide at least one of --from-file, --from-configdrive, --from-ec2-metadata, --from-cloudsigma-metadata, --from-packet-metadata, --from-digitalocean-metadata, --from-vmware-guestinfo, --from-waagent, --from-url or --from-proc-cmdline")`
`173`	`173`	`os.Exit(2)`
`174`	`174`	`}`
`175`	`175`