Skip to content

Commit

Permalink
Enhanced help for run and restore command
Browse files Browse the repository at this point in the history
Many available parameters for the restore and
run commands were missing in the help info and so
also in the <tab-tab> completion.

Now we should have hopefully all useful parameters documented
for run and restore.

Also, the tab-completion for "backupclient" and "restoreclient" now
works as it calls ".client"

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>
  • Loading branch information
pstorz authored and Marco van Wieringen committed Feb 17, 2015
1 parent 2ec5394 commit a9cfb6b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/console/console.c
Expand Up @@ -596,6 +596,8 @@ struct cpl_keywords_t {
static struct cpl_keywords_t cpl_keywords[] = {
{ "pool=", ".pool" },
{ "fileset=", ".fileset" },
{ "backupclient=", ".client" },
{ "restoreclient=", ".client" },
{ "client=", ".client" },
{ "job=", ".jobs" },
{ "restore_job=",".jobs type=R" },
Expand Down
8 changes: 7 additions & 1 deletion src/dird/ua_cmds.c
Expand Up @@ -170,7 +170,10 @@ static struct cmdstruct commands[] = {
NT_(""), false },
{ NT_("restore"), restore_cmd, _("Restore files"),
NT_("where=</path> client=<client-name> storage=<storage-name> bootstrap=<file>\n"
"\trestorejob=<job-name> comment=<text> jobid=<jobid> copies done select all"), false },
"\trestorejob=<job-name> comment=<text> jobid=<jobid> fileset=<fileset-name>\n"
"\treplace=<always|never|ifolder|ifnewer> pluginoptions=<plugin-options-string>\n"
"\tregexwhere=<regex> restoreclient=<client-name> backupclient=<client-name>\n"
"\tcopies done select all"), false },
{ NT_("relabel"), relabel_cmd, _("Relabel a tape"),
NT_("storage=<storage-name> oldvolume=<old-volume-name>\n"
"\tvolume=<new-volume-name> pool=<pool-name> [ encrypt ]"), false },
Expand All @@ -185,6 +188,9 @@ static struct cmdstruct commands[] = {
"\tfileset=<fileset-name> level=<level>\n"
"\tstorage=<storage-name> where=<directory-prefix>\n"
"\twhen=<universal-time-specification>\n"
"\tpool=<pool-name> pluginoptions=<plugin-options-string>\n"
"\taccurate=<yes|no> comment=<text>\n"
"\tspooldata=<yes|no> priority=<number>\n"
"\tcomment=<text> yes"), false },
{ NT_("status"), status_cmd, _("Report status"),
NT_("all | dir=<dir-name> | director | scheduler | schedule=<schedule-name> | client=<client-name> |\n"
Expand Down

0 comments on commit a9cfb6b

Please sign in to comment.