diff options
| -rwxr-xr-x | bin/puppetd | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/bin/puppetd b/bin/puppetd index b1194cc95..ddcaadfd6 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -355,7 +355,7 @@ end objects = [] # This has to go after the certs are dealt with. -if Puppet[:listen] +if Puppet[:listen] and ! options[:onetime] unless FileTest.exists?(Puppet[:authconfig]) Puppet.err "Will not start without authorization file %s" % Puppet[:authconfig] @@ -395,6 +395,8 @@ if Puppet[:listen] end objects << server +elsif options[:onetime] + Puppet.notice "Ignoring --listen on onetime run" end # now set up the network client with the certs, now that we have them @@ -415,10 +417,6 @@ if options[:onetime] exit(43) end - if server - Puppet.notice "Ignoring --listen on onetime run" - end - # Add the service, so the traps work correctly. Puppet.newservice(client) |