diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 83c964ccaf9f244ac48df1e8efb974a30dbaf8f8..2a173b77a1a6da80184f8ff2e8e124673bc6493a 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -2,6 +2,7 @@ ### Features - cta/CTA#211 - Add functionality for reading encrypted tapes with cta-readtp +- cta/CTA#214 - Update manual page for cta-admin to include info about user defined config files. # v4.7.14-1 diff --git a/cmdline/cta-admin.1cta b/cmdline/cta-admin.1cta index 9edb0c2ba8f01ae3d1aef5d10a7636420fe9ffad..37a2895e7868dae96031e5587c04d7207764b243 100644 --- a/cmdline/cta-admin.1cta +++ b/cmdline/cta-admin.1cta @@ -18,7 +18,7 @@ cta-admin \- Administrative command interface for CTA tape system operators .SH SYNOPSIS -\fBcta-admin\fP [--json] \fIcommand\fR [\fIsubcommand\fR] [\fIoptions\fR] +\fBcta-admin\fP [--json] [--config] <path> \fIcommand\fR [\fIsubcommand\fR] [\fIoptions\fR] .SH DESCRIPTION .P @@ -142,6 +142,12 @@ which are normally returned in plain text format, with one record per line. If t supplied, the results are returned as an array of records in JSON format. This option is intended for use by scripts to ease automated processing of results. +.TP +--config +This option is intended for users who want to specify the location of the config file as an argument in the cli. +If the option is not provided, the script will look for the config file ~/.cta/cta-cli.conf. The default config file +/etc/cta/cta-cli.conf is used if the user does not provide one. + .SH CONFIGURATION The \fBcta-admin\fP configuration is specified in \fI/etc/cta/cta-cli.conf\fR. The following configuration options are available: