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
@@ -129,13 +129,13 @@ ModifyNetworkInterfaceAttribute - [ ] [ ] ModifySnapshotAttribute setsattr [X] [X] ModifyVolumeAttribute - [ ] [ ] MonitorInstances - [ ] [ ] PurchaseReservedInstancesOffering - [ ] [ ] RebootInstances reboot [X] [X] RegisterImage - [ ] [ ] -ReleaseAddress freeaddr [X] [X] +ReleaseAddress rmaddr [X] [X] ReplaceNetworkAclAssociation - [ ] [ ] ReplaceNetworkAclEntry - [ ] [ ] ReplaceRoute - [ ] [ ] ReplaceRouteTableAssociation - [ ] [ ] ReportInstanceStatus - [ ] [ ] RequestSpotInstances - [ ] [ ] diff --git a/doc/Makefile.inc b/doc/Makefile.inc index 72921d3..4e1dafc 100644 --- a/doc/Makefile.inc +++ b/doc/Makefile.inc @@ -51,10 +51,10 @@ MANPAGES1=\ eclat-setiattr.1\ eclat-setsattr.1\ eclat-conmesg.1\ eclat-start.1\ eclat-stop.1\ eclat-reboot.1\ - eclat-freeaddr.1 + eclat-rmaddr.1 MANPAGES5=\ 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 @@ -35,13 +35,13 @@ success. .PP On success, the code 0 is returned to the shell. Non-zero status code is returned on error. .SH "SEE ALSO" .BR eclat (1), .BR eclat\-assocaddr (1), -.BR eclat\-freeaddr (1). +.BR eclat\-rmaddr (1). .SH AUTHORS Sergey Poznyakoff .SH "BUG REPORTS" Report bugs to <bug\-eclat@gnu.org.ua>. .SH COPYRIGHT Copyright \(co 2012, 2013 Sergey Poznyakoff 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 @@ -70,13 +70,13 @@ Associate an IP address with an instance in the VPC: .nf .B eclat assocaddr \-\-vpc i\-4fd2431a eipalloc\-5723d13e .fi .SH "SEE ALSO" .BR eclat (1), .BR eclat\-allocaddr (1), -.BR eclat\-freeaddr (1), +.BR eclat\-rmaddr (1), .BR eclat\-disassaddr (1). .SH AUTHORS Sergey Poznyakoff .SH "BUG REPORTS" Report bugs to <bug\-eclat@gnu.org.ua>. .SH COPYRIGHT 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 @@ -72,13 +72,13 @@ standard 192.0.2.1 i-f15ebb98 standard 198.51.100.2 .in .fi .SH "SEE ALSO" .BR eclat (1), .BR eclat\-allocaddr (1), -.BR eclat\-freeaddr (1), +.BR eclat\-rmaddr (1), .BR eclat\-assocaddr (1), .BR eclat\-disassaddr (1). .SH AUTHORS Sergey Poznyakoff .SH "BUG REPORTS" Report bugs to <bug\-eclat@gnu.org.ua>. 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 @@ -12,17 +12,17 @@ .\" GNU General Public License for more details. .\" .\" You should have received a copy of the GNU General Public License .\" along with Eclat. If not, see <http://www.gnu.org/licenses/>. .TH DISASSOCADDR 1 "April 20, 2013" "ECLAT" "Eclat User Reference" .SH NAME -eclat freeaddr, release\-address \- release Elastic IP address. +eclat rmaddr, release\-address \- release Elastic IP address. .SH SYNOPSIS -\fBeclat freeaddr\fR [\fB\-\-vpc\fR] [\fB\-v\fR] \fIIP\-OR\-ALLOCID\fR +\fBeclat rmaddr\fR [\fB\-\-vpc\fR] [\fB\-v\fR] \fIIP\-OR\-ALLOCID\fR -\fBeclat freeaddr\fR \fB\-\-help\fR +\fBeclat rmaddr\fR \fB\-\-help\fR .SH DESCRIPTION This command releases an Elastic IP address. The address must have been previously allocated using the .B allocaddr command. .SH OPTIONS @@ -43,26 +43,26 @@ is unable to recognize the response. The code 16 is returned if the operation is not confirmed. .SH EXAMPLES .SS 1. Release the Elastic IP: .P .nf -.B $ eclat freeaddr 192.0.2.1 +.B $ eclat rmaddr 192.0.2.1 Really release IP 192.0.2.1 [Y/n] y .fi .SS 2. Same, with confirmation disabled: .P .nf -.B $ eclat -Y freeaddr 192.0.2.1 +.B $ eclat -Y rmaddr 192.0.2.1 .fi .SS 3. Release the VPC Elastic IP: .P .nf -.B eclat freeaddr \-\-vpc eipalloc\-5723d13e +.B eclat rmaddr \-\-vpc eipalloc\-5723d13e .fi .SH "SEE ALSO" .BR eclat (1), .BR eclat\-allocaddr (1), .BR eclat\-assocaddr (1), .BR eclat\-disassaddr (1). diff --git a/src/Makefile.am b/src/Makefile.am index d97110a..6b796b1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,13 +27,12 @@ eclat_SOURCES=\ cpsnap.c\ deimg.c\ devol.c\ disasaddr.c\ eclat.c\ eclat.h\ - freeaddr.c\ genericcl.c\ getconout.c\ lsaddr.c\ lsattr.c\ lsiattr.c\ lsimg.c\ @@ -48,12 +47,13 @@ eclat_SOURCES=\ lszon.c\ mkimg.c\ mkinst.c\ mksnap.c\ mktags.c\ mkvol.c\ + rmaddr.c\ rmsnap.c\ rmvol.c\ setiattr.c\ startstop.c\ util.c @@ -69,25 +69,25 @@ OPTFILES=\ allocaddr-cl.opt\ asscaddr-cl.opt\ cpimg-cl.opt\ cpsnap-cl.opt\ devol-cl.opt\ disasaddr-cl.opt\ - freeaddr-cl.opt\ generic-cl.opt\ lsaddr-cl.opt\ lsattr-cl.opt\ lsimg-cl.opt\ lsistat-cl.opt\ lssg-cl.opt\ lssnap-cl.opt\ lstag-cl.opt\ mkimg-cl.opt\ mkinst-cl.opt\ mktags-cl.opt\ - mkvol-cl.opt + mkvol-cl.opt\ + rmaddr-cl.opt eclat_SOURCES += $(OPTFILES:.opt=.h) BUILT_SOURCES=\ cmdline.h\ $(OPTFILES:.opt=.h)\ diff --git a/src/eclat.c b/src/eclat.c index ee44053..b78e079 100644 --- a/src/eclat.c +++ b/src/eclat.c @@ -221,13 +221,13 @@ struct eclat_command cmdtab[] = { { "lsinst", "describe-instances", "DescribeInstances", eclat_describe_instances }, { "lsvol", "describe-volumes", "DescribeVolumes", eclat_describe_volumes }, { "allocaddr", "allocate-address", "AllocateAddress", eclat_allocate_address, CMD_MOD }, - { "freeaddr", "release-address", "ReleaseAddress", + { "rmaddr", "release-address", "ReleaseAddress", eclat_release_address, CMD_MOD|CMD_DESTR }, { "assocaddr", "associate-address", "AssociateAddress", eclat_associate_address, CMD_MOD }, { "disasaddr", "disassociate-address", "DisassociateAddress", eclat_disassociate_address, CMD_MOD }, { "mktag", "create-tags", "CreateTags", 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 |