diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-17 19:37:33 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-01-17 19:37:33 +0000 |
| commit | d343fac21c7ffcecd5868cd32172c30bbda884b7 (patch) | |
| tree | 3820bece31c8bdffcb94216ad0b3e6a74c01e251 /usr/src/cmd/lofiadm | |
| parent | 497e64114a7c88512fee6760a8cd305710765ce4 (diff) | |
| parent | 59927d313a821b7f3822314ed16fc0a44c128431 (diff) | |
| download | illumos-joyent-d343fac21c7ffcecd5868cd32172c30bbda884b7.tar.gz | |
[illumos-gate merge]
commit 59927d313a821b7f3822314ed16fc0a44c128431
3105 Kernel inet_pton() implementation returns result in host byte order
commit 71cb1b742ca23532b844b6538d8f0997a900c62e
3995 Memory leak of compressed buffers in l2arc_write_done
commit 2f045fd6af922f819146b314d143b660b58b20b7
4297 ::help tab completion
4298 ::printf tab completion
commit 483b029ba8436049005eb485fcc9b26f2484f7ea
4458 iscsit discovery reply should be more strict WRT TPGs
commit 795f5a90106de513be157280283fe8dd0c976787
4178 lofiadm usage message for the -a option is bogus
Conflicts:
usr/src/cmd/mdb/common/mdb/mdb_print.c
usr/src/cmd/mdb/common/mdb/mdb_cmds.c
Diffstat (limited to 'usr/src/cmd/lofiadm')
| -rw-r--r-- | usr/src/cmd/lofiadm/main.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/usr/src/cmd/lofiadm/main.c b/usr/src/cmd/lofiadm/main.c index 96d6764817..d93edd1ea9 100644 --- a/usr/src/cmd/lofiadm/main.c +++ b/usr/src/cmd/lofiadm/main.c @@ -66,9 +66,14 @@ #include <blowfish/blowfish_impl.h> static const char USAGE[] = - "Usage: %s [-r] -a file [ device ] " - " [-c aes-128-cbc|aes-192-cbc|aes-256-cbc|des3-cbc|blowfish-cbc]" - " [-e] [-k keyfile] [-T [token]:[manuf]:[serial]:key]\n" + "Usage: %s [-r] -a file [ device ]\n" + " %s [-r] -c crypto_algorithm -a file [device]\n" + " %s [-r] -c crypto_algorithm -k raw_key_file -a file [device]\n" + " %s [-r] -c crypto_algorithm -T [token]:[manuf]:[serial]:key " + "-a file [device]\n" + " %s [-r] -c crypto_algorithm -T [token]:[manuf]:[serial]:key " + "-k wrapped_key_file -a file [device]\n" + " %s [-r] -c crypto_algorithm -e -a file [device]\n" " %s -d file | device\n" " %s -C [gzip|gzip-6|gzip-9|lzma] [-s segment_size] file\n" " %s -U file\n" @@ -151,7 +156,7 @@ static void usage(const char *pname) { (void) fprintf(stderr, gettext(USAGE), pname, pname, pname, - pname, pname); + pname, pname, pname, pname, pname, pname, pname); exit(E_USAGE); } |