~ubuntu-branches/ubuntu/natty/euca2ools/natty-201106142030

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
Description: euca-run-instances: change --keypair to --key in usage and man
 The usage output simply differs from what the code.  The code expects
 '--key', but usage suggests '--keypair'.
 .
 Originally from 1.2-0ubuntu8 package version
Author: Scott Moser <scott.moser@canonical.com>
Last-Update: 2010-11-17
Bug: https://launchpad.net/bugs/530816
Forwarded: no
--- a/bin/euca-run-instances
+++ b/bin/euca-run-instances
@@ -42,7 +42,7 @@
     """
 Starts instances.
 
-euca-run-instances [-n, --instance-count count] [-g, --group group_name] [-k, --keypair keyname] 
+euca-run-instances [-n, --instance-count count] [-g, --group group_name] [-k, --key keyname] 
 [-d user_data] [-f user_data_file] [--addressing addressing] [-t, --instance-type instance_type] 
 [-z, --availability-zone zone] [--kernel kernel_id] [--ramdisk ramdisk_id] [-b block_device_mapping]
 [--monitor] [-s, --subnet subnet_id] 
@@ -58,7 +58,7 @@
 	
 -g, --group				Security group to run the instance under.
 
--k, --keypair				Name of a (previously created) keypair to associate with this reservation.		
+-k, --key				Name of a (previously created) keypair to associate with this reservation.		
 -d, --user-data				User data for instances read from the command line.
 
 -f, --user-data-file			User data for instances as a filename.
--- a/man/euca-run-instances.1
+++ b/man/euca-run-instances.1
@@ -5,7 +5,7 @@
 .SH DESCRIPTION
 Starts instances.
 .PP
-euca\-run\-instances [\-n, \fB\-\-instance\-count\fR count] [\-g, \fB\-\-group\fR group_name] [\-k, \fB\-\-keypair\fR keyname]
+euca\-run\-instances [\-n, \fB\-\-instance\-count\fR count] [\-g, \fB\-\-group\fR group_name] [\-k, \fB\-\-key\fR keyname]
 [\-d user_data] [\-f user_data_file] [\-\-addressing addressing] [\-t, \fB\-\-instance\-type\fR instance_type]
 [\-z, \fB\-\-availability\-zone\fR zone] [\-\-kernel kernel_id] [\-\-ramdisk ramdisk_id] [\-b block_device_mapping]
 [\-\-monitor] [\-s, \fB\-\-subnet\fR subnet_id] [\-\-disable\-api\-termination] [\-\-instanceinitiatedshutdown\-behavior behavior]
@@ -23,7 +23,7 @@
         
 \fB\-g\fR, \fB\-\-group\fR                             Security group to run the instance under.
 .PP
-\fB\-k\fR, \fB\-\-keypair\fR                           Name of a (previously created) keypair to associate with this reservation.              
+\fB\-k\fR, \fB\-\-key\fR                           Name of a (previously created) keypair to associate with this reservation.              
 \fB\-d\fR, \fB\-\-user\-data\fR                         User data for instances read from the command line.
 .PP
 \fB\-f\fR, \fB\-\-user\-data\-file\fR                    User data for instances as a filename.