summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/application/puppetd.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/application/puppetd.rb b/lib/puppet/application/puppetd.rb
index 56aaf9370..37a5d003d 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -125,7 +125,7 @@ Puppet::Application.new(:puppetd) do
Puppet.settings.handlearg("--no-daemonize")
options[:verbose] = true
options[:onetime] = true
- options[:waitforcert] = 0
+ options[:waitforcert] = 0 unless @explicit_waitforcert
end
# Handle the logging settings.