diff options
-rw-r--r-- | TODO | 2 | ||||
-rw-r--r-- | doc/Makefile.inc | 2 | ||||
-rw-r--r-- | doc/eclat-allocaddr.1 | 2 | ||||
-rw-r--r-- | doc/eclat-assocaddr.1 | 2 | ||||
-rw-r--r-- | doc/eclat-lsaddr.1 | 2 | ||||
-rw-r--r-- | doc/eclat-rmaddr.1 (renamed from doc/eclat-freeaddr.1) | 12 | ||||
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/eclat.c | 2 | ||||
-rw-r--r-- | src/rmaddr-cl.opt (renamed from src/freeaddr-cl.opt) | 0 | ||||
-rw-r--r-- | src/rmaddr.c (renamed from src/freeaddr.c) | 0 |
10 files changed, 15 insertions, 15 deletions
@@ -132,7 +132,7 @@ MonitorInstances - [ ] [ ] | |||
132 | PurchaseReservedInstancesOffering - [ ] [ ] | 132 | PurchaseReservedInstancesOffering - [ ] [ ] |
133 | RebootInstances reboot [X] [X] | 133 | RebootInstances reboot [X] [X] |
134 | RegisterImage - [ ] [ ] | 134 | RegisterImage - [ ] [ ] |
135 | ReleaseAddress freeaddr [X] [X] | 135 | ReleaseAddress rmaddr [X] [X] |
136 | ReplaceNetworkAclAssociation - [ ] [ ] | 136 | ReplaceNetworkAclAssociation - [ ] [ ] |
137 | ReplaceNetworkAclEntry - [ ] [ ] | 137 | ReplaceNetworkAclEntry - [ ] [ ] |
138 | ReplaceRoute - [ ] [ ] | 138 | ReplaceRoute - [ ] [ ] |
diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 72921d3..4e1dafc 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc | |||
@@ -54,7 +54,7 @@ MANPAGES1=\ | |||
54 | eclat-start.1\ | 54 | eclat-start.1\ |
55 | eclat-stop.1\ | 55 | eclat-stop.1\ |
56 | eclat-reboot.1\ | 56 | eclat-reboot.1\ |
57 | eclat-freeaddr.1 | 57 | eclat-rmaddr.1 |
58 | 58 | ||
59 | MANPAGES5=\ | 59 | MANPAGES5=\ |
60 | eclat.conf.5 | 60 | eclat.conf.5 |
diff --git a/doc/eclat-allocaddr.1 b/doc/eclat-allocaddr.1 index 8c183b1..23abed6 100644 --- a/doc/eclat-allocaddr.1 +++ b/doc/eclat-allocaddr.1 | |||
@@ -38,7 +38,7 @@ is returned on error. | |||
38 | .SH "SEE ALSO" | 38 | .SH "SEE ALSO" |
39 | .BR eclat (1), | 39 | .BR eclat (1), |
40 | .BR eclat\-assocaddr (1), | 40 | .BR eclat\-assocaddr (1), |
41 | .BR eclat\-freeaddr (1). | 41 | .BR eclat\-rmaddr (1). |
42 | .SH AUTHORS | 42 | .SH AUTHORS |
43 | Sergey Poznyakoff | 43 | Sergey Poznyakoff |
44 | .SH "BUG REPORTS" | 44 | .SH "BUG REPORTS" |
diff --git a/doc/eclat-assocaddr.1 b/doc/eclat-assocaddr.1 index 342d83b..da22421 100644 --- a/doc/eclat-assocaddr.1 +++ b/doc/eclat-assocaddr.1 | |||
@@ -73,7 +73,7 @@ Associate an IP address with an instance in the VPC: | |||
73 | .SH "SEE ALSO" | 73 | .SH "SEE ALSO" |
74 | .BR eclat (1), | 74 | .BR eclat (1), |
75 | .BR eclat\-allocaddr (1), | 75 | .BR eclat\-allocaddr (1), |
76 | .BR eclat\-freeaddr (1), | 76 | .BR eclat\-rmaddr (1), |
77 | .BR eclat\-disassaddr (1). | 77 | .BR eclat\-disassaddr (1). |
78 | .SH AUTHORS | 78 | .SH AUTHORS |
79 | Sergey Poznyakoff | 79 | Sergey Poznyakoff |
diff --git a/doc/eclat-lsaddr.1 b/doc/eclat-lsaddr.1 index ebaf41d..3efd0d2 100644 --- a/doc/eclat-lsaddr.1 +++ b/doc/eclat-lsaddr.1 | |||
@@ -75,7 +75,7 @@ standard 198.51.100.2 | |||
75 | .SH "SEE ALSO" | 75 | .SH "SEE ALSO" |
76 | .BR eclat (1), | 76 | .BR eclat (1), |
77 | .BR eclat\-allocaddr (1), | 77 | .BR eclat\-allocaddr (1), |
78 | .BR eclat\-freeaddr (1), | 78 | .BR eclat\-rmaddr (1), |
79 | .BR eclat\-assocaddr (1), | 79 | .BR eclat\-assocaddr (1), |
80 | .BR eclat\-disassaddr (1). | 80 | .BR eclat\-disassaddr (1). |
81 | .SH AUTHORS | 81 | .SH AUTHORS |
diff --git a/doc/eclat-freeaddr.1 b/doc/eclat-rmaddr.1 index 4701ccd..8deb962 100644 --- a/doc/eclat-freeaddr.1 +++ b/doc/eclat-rmaddr.1 | |||
@@ -15,11 +15,11 @@ | |||
15 | .\" along with Eclat. If not, see <http://www.gnu.org/licenses/>. | 15 | .\" along with Eclat. If not, see <http://www.gnu.org/licenses/>. |
16 | .TH DISASSOCADDR 1 "April 20, 2013" "ECLAT" "Eclat User Reference" | 16 | .TH DISASSOCADDR 1 "April 20, 2013" "ECLAT" "Eclat User Reference" |
17 | .SH NAME | 17 | .SH NAME |
18 | eclat freeaddr, release\-address \- release Elastic IP address. | 18 | eclat rmaddr, release\-address \- release Elastic IP address. |
19 | .SH SYNOPSIS | 19 | .SH SYNOPSIS |
20 | \fBeclat freeaddr\fR [\fB\-\-vpc\fR] [\fB\-v\fR] \fIIP\-OR\-ALLOCID\fR | 20 | \fBeclat rmaddr\fR [\fB\-\-vpc\fR] [\fB\-v\fR] \fIIP\-OR\-ALLOCID\fR |
21 | 21 | ||
22 | \fBeclat freeaddr\fR \fB\-\-help\fR | 22 | \fBeclat rmaddr\fR \fB\-\-help\fR |
23 | .SH DESCRIPTION | 23 | .SH DESCRIPTION |
24 | This command releases an Elastic IP address. The address must have been | 24 | This command releases an Elastic IP address. The address must have been |
25 | previously allocated using the | 25 | previously allocated using the |
@@ -46,20 +46,20 @@ The code 16 is returned if the operation is not confirmed. | |||
46 | Release the Elastic IP: | 46 | Release the Elastic IP: |
47 | .P | 47 | .P |
48 | .nf | 48 | .nf |
49 | .B $ eclat freeaddr 192.0.2.1 | 49 | .B $ eclat rmaddr 192.0.2.1 |
50 | Really release IP 192.0.2.1 [Y/n] y | 50 | Really release IP 192.0.2.1 [Y/n] y |
51 | .fi | 51 | .fi |
52 | .SS 2. | 52 | .SS 2. |
53 | Same, with confirmation disabled: | 53 | Same, with confirmation disabled: |
54 | .P | 54 | .P |
55 | .nf | 55 | .nf |
56 | .B $ eclat -Y freeaddr 192.0.2.1 | 56 | .B $ eclat -Y rmaddr 192.0.2.1 |
57 | .fi | 57 | .fi |
58 | .SS 3. | 58 | .SS 3. |
59 | Release the VPC Elastic IP: | 59 | Release the VPC Elastic IP: |
60 | .P | 60 | .P |
61 | .nf | 61 | .nf |
62 | .B eclat freeaddr \-\-vpc eipalloc\-5723d13e | 62 | .B eclat rmaddr \-\-vpc eipalloc\-5723d13e |
63 | .fi | 63 | .fi |
64 | .SH "SEE ALSO" | 64 | .SH "SEE ALSO" |
65 | .BR eclat (1), | 65 | .BR eclat (1), |
diff --git a/src/Makefile.am b/src/Makefile.am index d97110a..6b796b1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -30,7 +30,6 @@ eclat_SOURCES=\ | |||
30 | disasaddr.c\ | 30 | disasaddr.c\ |
31 | eclat.c\ | 31 | eclat.c\ |
32 | eclat.h\ | 32 | eclat.h\ |
33 | freeaddr.c\ | ||
34 | genericcl.c\ | 33 | genericcl.c\ |
35 | getconout.c\ | 34 | getconout.c\ |
36 | lsaddr.c\ | 35 | lsaddr.c\ |
@@ -51,6 +50,7 @@ eclat_SOURCES=\ | |||
51 | mksnap.c\ | 50 | mksnap.c\ |
52 | mktags.c\ | 51 | mktags.c\ |
53 | mkvol.c\ | 52 | mkvol.c\ |
53 | rmaddr.c\ | ||
54 | rmsnap.c\ | 54 | rmsnap.c\ |
55 | rmvol.c\ | 55 | rmvol.c\ |
56 | setiattr.c\ | 56 | setiattr.c\ |
@@ -72,7 +72,6 @@ OPTFILES=\ | |||
72 | cpsnap-cl.opt\ | 72 | cpsnap-cl.opt\ |
73 | devol-cl.opt\ | 73 | devol-cl.opt\ |
74 | disasaddr-cl.opt\ | 74 | disasaddr-cl.opt\ |
75 | freeaddr-cl.opt\ | ||
76 | generic-cl.opt\ | 75 | generic-cl.opt\ |
77 | lsaddr-cl.opt\ | 76 | lsaddr-cl.opt\ |
78 | lsattr-cl.opt\ | 77 | lsattr-cl.opt\ |
@@ -84,7 +83,8 @@ OPTFILES=\ | |||
84 | mkimg-cl.opt\ | 83 | mkimg-cl.opt\ |
85 | mkinst-cl.opt\ | 84 | mkinst-cl.opt\ |
86 | mktags-cl.opt\ | 85 | mktags-cl.opt\ |
87 | mkvol-cl.opt | 86 | mkvol-cl.opt\ |
87 | rmaddr-cl.opt | ||
88 | 88 | ||
89 | eclat_SOURCES += $(OPTFILES:.opt=.h) | 89 | eclat_SOURCES += $(OPTFILES:.opt=.h) |
90 | 90 | ||
diff --git a/src/eclat.c b/src/eclat.c index ee44053..b78e079 100644 --- a/src/eclat.c +++ b/src/eclat.c | |||
@@ -224,7 +224,7 @@ struct eclat_command cmdtab[] = { | |||
224 | eclat_describe_volumes }, | 224 | eclat_describe_volumes }, |
225 | { "allocaddr", "allocate-address", "AllocateAddress", | 225 | { "allocaddr", "allocate-address", "AllocateAddress", |
226 | eclat_allocate_address, CMD_MOD }, | 226 | eclat_allocate_address, CMD_MOD }, |
227 | { "freeaddr", "release-address", "ReleaseAddress", | 227 | { "rmaddr", "release-address", "ReleaseAddress", |
228 | eclat_release_address, CMD_MOD|CMD_DESTR }, | 228 | eclat_release_address, CMD_MOD|CMD_DESTR }, |
229 | { "assocaddr", "associate-address", "AssociateAddress", | 229 | { "assocaddr", "associate-address", "AssociateAddress", |
230 | eclat_associate_address, CMD_MOD }, | 230 | eclat_associate_address, CMD_MOD }, |
diff --git a/src/freeaddr-cl.opt b/src/rmaddr-cl.opt index be70065..be70065 100644 --- a/src/freeaddr-cl.opt +++ b/src/rmaddr-cl.opt | |||
diff --git a/src/freeaddr.c b/src/rmaddr.c index b970248..b970248 100644 --- a/src/freeaddr.c +++ b/src/rmaddr.c | |||