summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2013-04-25 15:43:14 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2013-04-25 15:46:37 (GMT)
commitaf02bbe4ab84ddd6a5ec8da3bab0fa360e8bded2 (patch) (side-by-side diff)
tree6960200d5d16046f82f45117003b50930a08ea7d
parentc00e8ff6d9cef344ce439a2553c5627f519face7 (diff)
downloadeclat-af02bbe4ab84ddd6a5ec8da3bab0fa360e8bded2.tar.gz
eclat-af02bbe4ab84ddd6a5ec8da3bab0fa360e8bded2.tar.bz2
Rename freeaddr to rmaddr
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--TODO2
-rw-r--r--doc/Makefile.inc2
-rw-r--r--doc/eclat-allocaddr.12
-rw-r--r--doc/eclat-assocaddr.12
-rw-r--r--doc/eclat-lsaddr.12
-rw-r--r--doc/eclat-rmaddr.1 (renamed from doc/eclat-freeaddr.1)12
-rw-r--r--src/Makefile.am6
-rw-r--r--src/eclat.c2
-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
diff --git a/TODO b/TODO
index ccf78d5..735c8cc 100644
--- a/TODO
+++ b/TODO
@@ -123,25 +123,25 @@ GetPasswordData - [ ] [ ]
ImportInstance - [ ] [ ]
ImportKeyPair - [ ] [ ]
ImportVolume - [ ] [ ]
ModifyImageAttribute - [ ] [ ]
ModifyInstanceAttribute setiattr [X] [X]
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 - [ ] [ ]
ResetImageAttribute - [ ] [ ]
ResetInstanceAttribute - [ ] [ ]
ResetNetworkInterfaceAttribute - [ ] [ ]
ResetSnapshotAttribute clrsattr [X] [X]
RevokeSecurityGroupEgress - [ ] [ ]
RevokeSecurityGroupIngress - [ ] [ ]
diff --git a/doc/Makefile.inc b/doc/Makefile.inc
index 72921d3..4e1dafc 100644
--- a/doc/Makefile.inc
+++ b/doc/Makefile.inc
@@ -45,16 +45,16 @@ MANPAGES1=\
eclat-lssattr.1\
eclat-lssnap.1\
eclat-lstag.1\
eclat-lsvol.1\
eclat-devol.1\
eclat-disasaddr.1\
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
@@ -29,25 +29,25 @@ command allocates an Elastic IP address. It does not take arguments.
.TP
\fB\-v\fR, \fB\-\-vpc\fR
Allocate address for use with instances in a VPC.
.SH "OUTPUT AND RETURN VALUE"
The default output format displays the allocated IP address on
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
.br
.na
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
.br
.ad
This is free software: you are free to change and redistribute it.
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
@@ -64,25 +64,25 @@ Assign an Elastic IP to the instance:
.nf
.B eclat assocaddr i\-2ea64347 192.0.2.1
.fi
.SS 2.
Associate an IP address with an instance in the VPC:
.P
.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
Copyright \(co 2012, 2013 Sergey Poznyakoff
.br
.na
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
.br
.ad
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
@@ -66,25 +66,25 @@ allocation ID and association ID.
.SH EXAMPLE
.sp
.nf
.in +2
$ eclat lsaddr
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>.
.SH COPYRIGHT
Copyright \(co 2012, 2013 Sergey Poznyakoff
.br
.na
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
.br
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
@@ -6,29 +6,29 @@
.\" the Free Software Foundation; either version 3, or (at your option)
.\" any later version.
.\"
.\" Eclat is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" 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
.TP
\fB\-v\fR, \fB\-\-vpc\fR
Release a VPC Elastic IP address. If this option is given, the
argument is treated as the allocation ID corresponding to the VPC
Elastic IP address.
.SH "OUTPUT AND RETURN VALUE"
@@ -37,38 +37,38 @@ succeeds. Otherwise it prints on the standard error the diagnostic
message returned by the Amazon, and returns code 1 to the shell.
.PP
The code 2 is returned if
.B eclat
is unable to recognize the response.
.PP
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).
.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/src/Makefile.am b/src/Makefile.am
index d97110a..6b796b1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,79 +21,79 @@ eclat_SOURCES=\
allocaddr.c\
asscaddr.c\
atvol.c\
cmdline.h\
config.c\
cpimg.c\
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\
lsinst.c\
lsistat.c\
lsreg.c\
lssattr.c\
lssg.c\
lssnap.c\
lstag.c\
lsvol.c\
lszon.c\
mkimg.c\
mkinst.c\
mksnap.c\
mktags.c\
mkvol.c\
+ rmaddr.c\
rmsnap.c\
rmvol.c\
setiattr.c\
startstop.c\
util.c
LDADD=../lib/libeclat.a @LIBOBJS@ ../grecs/src/libgrecs.a $(CURL_LIBS) @MAPLIBS@
AM_CPPFLAGS = \
-I$(top_srcdir)/grecs/src/ -I$(top_srcdir)/lib $(CURL_CFLAGS)\
-DSYSCONFDIR=\"$(sysconfdir)\"\
-DDEFAULT_VERSION_INCLUDE_DIR=\"$(incdir)\"\
-DDEFAULT_INCLUDE_DIR=\"$(pkgdatadir)/include\"\
-DDEFAULT_PREPROCESSOR="$(DEFAULT_PREPROCESSOR)"
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)\
comtab.man\
xref.man
EXTRA_DIST=\
cmdline.opt\
$(OPTFILES)\
diff --git a/src/eclat.c b/src/eclat.c
index ee44053..b78e079 100644
--- a/src/eclat.c
+++ b/src/eclat.c
@@ -215,25 +215,25 @@ struct eclat_command cmdtab[] = {
eclat_describe_addresses },
{ "lstag", "describe-tags", "DescribeTags", eclat_describe_tags },
{ "lsiattr", "describe-instance-attribute", "DescribeInstanceAttribute",
eclat_describe_instance_attribute },
{ "lsistat", "describe-instance-status", "DescribeInstanceStatus",
eclat_describe_instance_status },
{ "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",
eclat_create_tags, CMD_MOD },
{ "rmtag", "delete-tags", "DeleteTags",
eclat_delete_tags, CMD_MOD|CMD_DESTR },
{ "conmesg", "get-console-output", "GetConsoleOutput",
eclat_get_console_output },
{ "lssg", "describe-security-groups", "DescribeSecurityGroups",
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

Return to:

Send suggestions and report system problems to the System administrator.