diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-03-16 14:34:13 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2021-03-16 15:10:47 +0100 |
commit | 01bb3afb5197cffec6bfe324a2efc314ddfdca57 (patch) | |
tree | d5fe629ac1bea2dd3d6daa79cbe4a7ce7eb60966 /src | |
parent | 1b6c463e033f861561d1a46ccf7eec069bbac09f (diff) | |
parent | 4d008f908e18abee9513560e36a92a0e97c65d68 (diff) | |
download | bitcoin-01bb3afb5197cffec6bfe324a2efc314ddfdca57.tar.xz |
Merge #21447: Always add -daemonwait to known command line arguments
4d008f908e18abee9513560e36a92a0e97c65d68 Always add -daemonwait to known command line arguments (Hennadii Stepanov)
Pull request description:
This is a follow up of #21007.
When `AC_CHECK_DECLS([fork])` fails:
- on master (8e6532053f580003869346510fc1dc20c46c8067):
```
$ src/bitcoind -daemonwait
Error: Error parsing command line arguments: Invalid parameter -daemonwait
```
- with this PR:
```
$ src/bitcoind -daemonwait
Error: -daemon is not supported on this operating system
```
ACKs for top commit:
laanwj:
Code review ACK 4d008f908e18abee9513560e36a92a0e97c65d68
Tree-SHA512: 7fcb5e9d76958adcf57e04fa74bd2a98d62459d81a3c57a97bd74c346cbf47c53e560a15455fb024e912c3b44e8487a83499e993b282871ba069953e665d88a9
Diffstat (limited to 'src')
-rw-r--r-- | src/init.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/init.cpp b/src/init.cpp index 67ca98ee6f..7d5420e3be 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -585,6 +585,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 // Add the hidden options |