diff options
-rw-r--r-- | NEWS | 7 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
m--------- | grecs | 0 | ||||
-rw-r--r-- | src/allocaddr-cl.opt | 4 | ||||
-rw-r--r-- | src/asscaddr-cl.opt | 4 | ||||
-rw-r--r-- | src/atvol.c | 2 | ||||
-rw-r--r-- | src/cpimg-cl.opt | 3 | ||||
-rw-r--r-- | src/cpsnap-cl.opt | 3 | ||||
-rw-r--r-- | src/deimg.c | 4 | ||||
-rw-r--r-- | src/detvol-cl.opt | 4 | ||||
-rw-r--r-- | src/disasaddr-cl.opt | 4 | ||||
-rw-r--r-- | src/eclat.h | 5 | ||||
-rw-r--r-- | src/freeaddr-cl.opt | 4 | ||||
-rw-r--r-- | src/generic-cl.opt | 9 | ||||
-rw-r--r-- | src/getconout.c | 2 | ||||
-rw-r--r-- | src/lsaddr-cl.opt | 4 | ||||
-rw-r--r-- | src/lsattr-cl.opt | 4 | ||||
-rw-r--r-- | src/lsiattr.c | 2 | ||||
-rw-r--r-- | src/lsimg-cl.opt | 4 | ||||
-rw-r--r-- | src/lsinst.c | 7 | ||||
-rw-r--r-- | src/lsistat-cl.opt | 4 | ||||
-rw-r--r-- | src/lsreg.c | 7 | ||||
-rw-r--r-- | src/lssattr.c | 6 | ||||
-rw-r--r-- | src/lssg-cl.opt | 4 | ||||
-rw-r--r-- | src/lssnap-cl.opt | 4 | ||||
-rw-r--r-- | src/lstag-cl.opt | 4 | ||||
-rw-r--r-- | src/lsvol.c | 2 | ||||
-rw-r--r-- | src/lszon.c | 10 | ||||
-rw-r--r-- | src/mkimg-cl.opt | 4 | ||||
-rw-r--r-- | src/mkinst-cl.opt | 4 | ||||
-rw-r--r-- | src/mksnap.c | 2 | ||||
-rw-r--r-- | src/mktags-cl.opt | 4 | ||||
-rw-r--r-- | src/mkvol-cl.opt | 4 | ||||
-rw-r--r-- | src/rmsnap.c | 2 | ||||
-rw-r--r-- | src/rmvol.c | 2 | ||||
-rw-r--r-- | src/setiattr.c | 2 | ||||
-rw-r--r-- | src/startstop.c | 11 | ||||
-rw-r--r-- | src/util.c | 2 |
38 files changed, 86 insertions, 70 deletions
@@ -1,10 +1,15 @@ | |||
1 | Eclat NEWS -- history of user-visible changes. 2013-01-19 | 1 | Eclat NEWS -- history of user-visible changes. 2013-04-24 |
2 | Copyright (C) 2012, 2013 Sergey Poznyakoff | 2 | Copyright (C) 2012, 2013 Sergey Poznyakoff |
3 | See the end of file for copying conditions. | 3 | See the end of file for copying conditions. |
4 | 4 | ||
5 | Please send Eclat bug reports to <gray+eclat@gnu.org.ua> | 5 | Please send Eclat bug reports to <gray+eclat@gnu.org.ua> |
6 | 6 | ||
7 | 7 | ||
8 | Version 0.9.90, Git | ||
9 | |||
10 | Implement more commands. | ||
11 | |||
12 | |||
8 | Version 0.1, 2012-10-23 | 13 | Version 0.1, 2012-10-23 |
9 | 14 | ||
10 | First alpha release. | 15 | First alpha release. |
diff --git a/configure.ac b/configure.ac index 64636fc..43daa5a 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -15,7 +15,7 @@ | |||
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 | 16 | ||
17 | AC_PREREQ(2.63) | 17 | AC_PREREQ(2.63) |
18 | AC_INIT([eclat], 0.1, [bug-eclat@gnu.org.ua],, | 18 | AC_INIT([eclat], 0.9.90, [bug-eclat@gnu.org.ua],, |
19 | [http://www.gnu.org.ua/software/eclat]) | 19 | [http://www.gnu.org.ua/software/eclat]) |
20 | AC_CONFIG_SRCDIR([src/eclat.h]) | 20 | AC_CONFIG_SRCDIR([src/eclat.h]) |
21 | AC_CONFIG_AUX_DIR([build-aux]) | 21 | AC_CONFIG_AUX_DIR([build-aux]) |
diff --git a/grecs b/grecs | |||
Subproject 588bb9898edcc8b531980fcb180e4955d29ed40 | Subproject 62fb1075edd466dc0b713ef8feeadacb1bad317 | ||
diff --git a/src/allocaddr-cl.opt b/src/allocaddr-cl.opt index 4c07803..c618375 100644 --- a/src/allocaddr-cl.opt +++ b/src/allocaddr-cl.opt | |||
@@ -14,11 +14,11 @@ | |||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
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 | 16 | ||
17 | OPTIONS_BEGIN("eclat allocate-address", | 17 | OPTIONS_COMMAND_BEGIN("eclat", |
18 | [<allocaddr, allocate-address>], | ||
18 | [<allocate Elastic IP address>], | 19 | [<allocate Elastic IP address>], |
19 | [<>], | 20 | [<>], |
20 | [<gnu>], | 21 | [<gnu>], |
21 | [<nousage>], | ||
22 | [<noversion>]) | 22 | [<noversion>]) |
23 | 23 | ||
24 | OPTION(vpc,v,, | 24 | OPTION(vpc,v,, |
diff --git a/src/asscaddr-cl.opt b/src/asscaddr-cl.opt index 3c63e19..87846e3 100644 --- a/src/asscaddr-cl.opt +++ b/src/asscaddr-cl.opt | |||
@@ -14,11 +14,11 @@ | |||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
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 | 16 | ||
17 | OPTIONS_BEGIN("eclat associate-address", | 17 | OPTIONS_COMMAND_BEGIN("eclat", |
18 | [<asscaddr, associate-address>], | ||
18 | [<associate IP address with an instance>], | 19 | [<associate IP address with an instance>], |
19 | [<INSTANCE IP-OR-ALLOC-ID>], | 20 | [<INSTANCE IP-OR-ALLOC-ID>], |
20 | [<gnu>], | 21 | [<gnu>], |
21 | [<nousage>], | ||
22 | [<noversion>]) | 22 | [<noversion>]) |
23 | 23 | ||
24 | OPTION(vpc,v,, | 24 | OPTION(vpc,v,, |
diff --git a/src/atvol.c b/src/atvol.c index de81454..2ee452b 100644 --- a/src/atvol.c +++ b/src/atvol.c | |||
@@ -22,7 +22,7 @@ eclat_attach_volume(eclat_command_env_t *env, int argc, char **argv) | |||
22 | int i; | 22 | int i; |
23 | 23 | ||
24 | generic_proginfo->args_doc = "VOL-ID INST-ID DEV-NAME"; | 24 | generic_proginfo->args_doc = "VOL-ID INST-ID DEV-NAME"; |
25 | generic_parse_options("eclat attach-volume", | 25 | generic_parse_options(env->cmd, |
26 | "attach a volume to an instance", | 26 | "attach a volume to an instance", |
27 | argc, argv, &i); | 27 | argc, argv, &i); |
28 | 28 | ||
diff --git a/src/cpimg-cl.opt b/src/cpimg-cl.opt index d31bb92..4a01386 100644 --- a/src/cpimg-cl.opt +++ b/src/cpimg-cl.opt | |||
@@ -19,7 +19,8 @@ char *image; | |||
19 | char *name; | 19 | char *name; |
20 | char *descr; | 20 | char *descr; |
21 | 21 | ||
22 | OPTIONS_BEGIN("eclat copy-image", | 22 | OPTIONS_COMMAND_BEGIN("eclat", |
23 | [<cpimg, copy-image>], | ||
23 | [<copy an AMI from another region>], | 24 | [<copy an AMI from another region>], |
24 | [<REGION AMI-ID>], | 25 | [<REGION AMI-ID>], |
25 | [<gnu>], | 26 | [<gnu>], |
diff --git a/src/cpsnap-cl.opt b/src/cpsnap-cl.opt index e53a2cc..13423b5 100644 --- a/src/cpsnap-cl.opt +++ b/src/cpsnap-cl.opt | |||
@@ -18,7 +18,8 @@ char *region; | |||
18 | char *image; | 18 | char *image; |
19 | char *descr; | 19 | char *descr; |
20 | 20 | ||
21 | OPTIONS_BEGIN("eclat copy-snapshot", | 21 | OPTIONS_COMMAND_BEGIN("eclat", |
22 | [<cpsnap, copy-snapshot>], | ||
22 | [<copy snapshot from another region>], | 23 | [<copy snapshot from another region>], |
23 | [<REGION SNAP-ID>], | 24 | [<REGION SNAP-ID>], |
24 | [<gnu>], | 25 | [<gnu>], |
diff --git a/src/deimg.c b/src/deimg.c index 73fda13..4a76d39 100644 --- a/src/deimg.c +++ b/src/deimg.c | |||
@@ -22,9 +22,7 @@ eclat_deregister_image(eclat_command_env_t *env, int argc, char **argv) | |||
22 | int i; | 22 | int i; |
23 | 23 | ||
24 | generic_proginfo->args_doc = "AMI-ID"; | 24 | generic_proginfo->args_doc = "AMI-ID"; |
25 | generic_parse_options("eclat deregister-image", | 25 | generic_parse_options(env->cmd, "deregister AMI", argc, argv, &i); |
26 | "deregister AMI", | ||
27 | argc, argv, &i); | ||
28 | argv += i; | 26 | argv += i; |
29 | argc -= i; | 27 | argc -= i; |
30 | 28 | ||
diff --git a/src/detvol-cl.opt b/src/detvol-cl.opt index b1781b4..2acf20b 100644 --- a/src/detvol-cl.opt +++ b/src/detvol-cl.opt | |||
@@ -14,11 +14,11 @@ | |||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
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 | 16 | ||
17 | OPTIONS_BEGIN("eclat detach-volume", | 17 | OPTIONS_COMMAND_BEGIN("eclat", |
18 | [<devol, detach-volume>], | ||
18 | [<detach a volume from instance>], | 19 | [<detach a volume from instance>], |
19 | [<VOL-ID [INST-ID [DEV-NAME]]>], | 20 | [<VOL-ID [INST-ID [DEV-NAME]]>], |
20 | [<gnu>], | 21 | [<gnu>], |
21 | [<nousage>], | ||
22 | [<noversion>]) | 22 | [<noversion>]) |
23 | 23 | ||
24 | OPTION(force,f,, | 24 | OPTION(force,f,, |
diff --git a/src/disasaddr-cl.opt b/src/disasaddr-cl.opt index 9be979b..0695387 100644 --- a/src/disasaddr-cl.opt +++ b/src/disasaddr-cl.opt | |||
@@ -14,11 +14,11 @@ | |||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
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 | 16 | ||
17 | OPTIONS_BEGIN("eclat disassociate-address", | 17 | OPTIONS_COMMAND_BEGIN("eclat", |
18 | [<disasadr, disassociate-address>], | ||
18 | [<disassociate IP address from instance>], | 19 | [<disassociate IP address from instance>], |
19 | [<IP-OR-ALLOC-ID>], | 20 | [<IP-OR-ALLOC-ID>], |
20 | [<gnu>], | 21 | [<gnu>], |
21 | [<nousage>], | ||
22 | [<noversion>]) | 22 | [<noversion>]) |
23 | 23 | ||
24 | OPTION(vpc,v,, | 24 | OPTION(vpc,v,, |
diff --git a/src/eclat.h b/src/eclat.h index 73bf25c..d4d863f 100644 --- a/src/eclat.h +++ b/src/eclat.h | |||
@@ -85,6 +85,8 @@ struct eclat_command { | |||
85 | }; | 85 | }; |
86 | 86 | ||
87 | struct eclat_command *find_command_name(const char *name); | 87 | struct eclat_command *find_command_name(const char *name); |
88 | int eclat_do_command(eclat_command_env_t *env, struct eclat_command *command, | ||
89 | int argc, char **argv); | ||
88 | 90 | ||
89 | int eclat_start_instance(eclat_command_env_t *env, int argc, char **argv); | 91 | int eclat_start_instance(eclat_command_env_t *env, int argc, char **argv); |
90 | int eclat_stop_instance(eclat_command_env_t *env, int argc, char **argv); | 92 | int eclat_stop_instance(eclat_command_env_t *env, int argc, char **argv); |
@@ -176,7 +178,8 @@ int get_access_creds(const char *id, char **access_key_ptr, | |||
176 | void define_format(const char *name, const char *fmt, grecs_locus_t *loc |