diff options
| author | Werner Koch <[email protected]> | 2024-01-26 08:41:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-01-26 08:41:00 +0000 |
| commit | dfa60c09f5cd992515df5fdb275dbee7f8f23b71 (patch) | |
| tree | e68215d4b947727fa98eb8c95244b8819b058b1e /g13/g13.c | |
| parent | gpg: Clean up pk_ecdh_decrypt function. (diff) | |
| parent | Post release updates (diff) | |
| download | gnupg-dfa60c09f5cd992515df5fdb275dbee7f8f23b71.tar.gz gnupg-dfa60c09f5cd992515df5fdb275dbee7f8f23b71.zip | |
Merge branch 'STABLE-BRANCH-2-4'
--
Fixed conflicts:
NEWS
configure.ac
doc/gpg.texi
Diffstat (limited to 'g13/g13.c')
| -rw-r--r-- | g13/g13.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -104,6 +104,7 @@ enum cmd_and_opt_values { oWithColons, oDryRun, oNoDetach, + oNoMount, oNoRandomSeedFile, oFakedSystemTime @@ -138,6 +139,7 @@ static gpgrt_opt_t opts[] = { ARGPARSE_s_s (oLogFile, "log-file", N_("|FILE|write log output to FILE")), ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"), ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"), + ARGPARSE_s_n (oNoMount, "no-mount", N_("stop right before running mount")), ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")), @@ -516,6 +518,8 @@ main (int argc, char **argv) case oNoDetach: /*nodetach = 1; */break; + case oNoMount: opt.no_mount = 1; break; + case oDebug: if (parse_debug_flag (pargs.r.ret_str, &opt.debug, debug_flags)) { |