Merge 01bb3afb51 into merged_master (Bitcoin PR #21447)

This commit is contained in:
Andrew Poelstra 2021-06-27 03:13:21 +00:00
commit 07d04a45c3

View file

@ -610,6 +610,7 @@ void SetupServerArgs(NodeContext& node)
argsman.AddArg("-daemonwait", strprintf("Wait for initialization to be finished before exiting. This implies -daemon (default: %d)", DEFAULT_DAEMONWAIT), ArgsManager::ALLOW_BOOL, OptionsCategory::OPTIONS);
#else
hidden_args.emplace_back("-daemon");
hidden_args.emplace_back("-daemonwait");
#endif
//