subdirectory configuration scheme: adapt usage text

bareos · Aug 25, 2016 · bcbb17f · bcbb17f
1 parent e5f67ab
commit bcbb17f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/src/console/console.c b/src/console/console.c
@@ -115,7 +115,7 @@ PROG_COPYRIGHT
 "Usage: bconsole [-s] [-c config_file] [-d debug_level]\n"
 "        -D <dir>    select a Director\n"
 "        -l          list Directors defined\n"
-"        -c <file>   set configuration file to file\n"
+"        -c <path>   specify configuration file or directory\n"
 "        -d <nn>     set debug level to <nn>\n"
 "        -dt         print timestamp in debug output\n"
 "        -n          no conio\n"

diff --git a/src/dird/dird.c b/src/dird/dird.c
@@ -169,8 +169,8 @@ static void usage()
    fprintf(stderr, _(
 PROG_COPYRIGHT
 "\nVersion: %s (%s)\n\n"
-"Usage: bareos-dir [options] [-c config_file] [-d debug_level] [config_file]\n"
-"        -c <file>   use <file> as configuration file\n"
+"Usage: bareos-dir [options]\n"
+"        -c <path>   use <path> as configuration file or directory\n"
 "        -d <nn>     set debug level to <nn>\n"
 "        -dt         print timestamp in debug output\n"
 "        -f          run in foreground (for debugging)\n"

diff --git a/src/stored/bcopy.c b/src/stored/bcopy.c
@@ -58,7 +58,7 @@ PROG_COPYRIGHT
 "\nVersion: %s (%s)\n\n"
 "Usage: bcopy [-d debug_level] <input-archive> <output-archive>\n"
 "       -b bootstrap    specify a bootstrap file\n"
-"       -c <file>       specify a Storage configuration file\n"
+"       -c <path>       specify a Storage configuration file or directory\n"
 "       -D <director>   specify a director name specified in the Storage\n"
 "                       configuration file for the Key Encryption Key selection\n"
 "       -d <nn>         set debug level to <nn>\n"

diff --git a/src/stored/bextract.c b/src/stored/bextract.c
@@ -69,7 +69,7 @@ PROG_COPYRIGHT
 "\nVersion: %s (%s)\n\n"
 "Usage: bextract <options> <bareos-archive-device-name> <directory-to-store-files>\n"
 "       -b <file>       specify a bootstrap file\n"
-"       -c <file>       specify a Storage configuration file\n"
+"       -c <path>       specify a Storage configuration file or directory\n"
 "       -D <director>   specify a director name specified in the Storage\n"
 "                       configuration file for the Key Encryption Key selection\n"
 "       -d <nn>         set debug level to <nn>\n"

diff --git a/src/stored/bls.c b/src/stored/bls.c
@@ -62,7 +62,7 @@ PROG_COPYRIGHT
 "\nVersion: %s (%s)\n\n"
 "Usage: bls [options] <device-name>\n"
 "       -b <file>       specify a bootstrap file\n"
-"       -c <file>       specify a Storage configuration file\n"
+"       -c <path>       specify a Storage configuration file or directory\n"
 "       -D <director>   specify a director name specified in the Storage\n"
 "                       configuration file for the Key Encryption Key selection\n"
 "       -d <nn>         set debug level to <nn>\n"

diff --git a/src/stored/bscan.c b/src/stored/bscan.c
@@ -104,7 +104,7 @@ PROG_COPYRIGHT
 "Usage: bscan [ options ] <device-name>\n"
 "       -B <drivername>   specify the database driver name (default NULL) <postgresql|mysql|sqlite3>\n"
 "       -b <bootstrap>    specify a bootstrap file\n"
-"       -c <file>         specify storage daemon configuration file\n"
+"       -c <path>         specify a Storage configuration file or directory\n"
 "       -d <nnn>          set debug level to <nnn>\n"
 "       -dt               print timestamp in debug output\n"
 "       -m                update media info in database\n"

diff --git a/src/stored/btape.c b/src/stored/btape.c
@@ -3009,7 +3009,7 @@ PROG_COPYRIGHT
 "\nVersion: %s (%s)\n\n"
 "Usage: btape <options> <device_name>\n"
 "       -b <file>     specify bootstrap file\n"
-"       -c <file>     set Storage configuration file to file\n"
+"       -c <path>     specify Storage configuration file or directory\n"
 "       -D <director> specify a director name specified in the Storage\n"
 "                     configuration file for the Key Encryption Key selection\n"
 "       -d <nn>       set debug level to <nn>\n"

diff --git a/src/stored/stored.c b/src/stored/stored.c
@@ -68,8 +68,8 @@ static void usage()
    fprintf(stderr, _(
 PROG_COPYRIGHT
 "\nVersion: %s (%s)\n\n"
-"Usage: bareos-sd [options] [-c config_file] [config_file]\n"
-"        -c <file>   use <file> as configuration file\n"
+"Usage: bareos-sd [options]\n"
+"        -c <path>   use <path> as configuration file or directory\n"
 "        -d <nn>     set debug level to <nn>\n"
 "        -dt         print timestamp in debug output\n"
 "        -f          run in foreground (for debugging)\n"