diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-21 07:44:54 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-21 07:44:54 -0300 |
| commit | 1fc6b0207cc2f3cce33817706603caa41a9de24d (patch) | |
| tree | d2d812b76b08f42a002621f716dd5f3199c7ca7d /contrib/libarchive/cpio/cmdline.c | |
| parent | b8632c4f34175c7018be77059ab229e755eb67e0 (diff) | |
| parent | bc9e0dd07a76c4d7a1c6fcf21824ca2cecff2c6d (diff) | |
| download | FreeBSD-src-1fc6b0207cc2f3cce33817706603caa41a9de24d.zip FreeBSD-src-1fc6b0207cc2f3cce33817706603caa41a9de24d.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib/libarchive/cpio/cmdline.c')
| -rw-r--r-- | contrib/libarchive/cpio/cmdline.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/libarchive/cpio/cmdline.c b/contrib/libarchive/cpio/cmdline.c index b05a736..e30a898 100644 --- a/contrib/libarchive/cpio/cmdline.c +++ b/contrib/libarchive/cpio/cmdline.c @@ -73,6 +73,7 @@ static const struct option { { "link", 0, 'l' }, { "list", 0, 't' }, { "lrzip", 0, OPTION_LRZIP }, + { "lz4", 0, OPTION_LZ4 }, { "lzma", 0, OPTION_LZMA }, { "lzop", 0, OPTION_LZOP }, { "make-directories", 0, 'd' }, @@ -80,6 +81,7 @@ static const struct option { { "null", 0, '0' }, { "numeric-uid-gid", 0, 'n' }, { "owner", 1, 'R' }, + { "passphrase", 1, OPTION_PASSPHRASE }, { "pass-through", 0, 'p' }, { "preserve-modification-time", 0, 'm' }, { "preserve-owner", 0, OPTION_PRESERVE_OWNER }, |
