← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/run-instances-usage-and-manpage-keypair.patch

  • Committer: Scott Moser
  • Date: 2010-11-17 21:23:16 UTC
  • Revision ID: smoser@ubuntu.com-20101117212316-is94e55u3jv46y9l
move to quilt 3.0 source format, re-apply all relevant delta

Show diffs side-by-side

added added

removed removed

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