summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2009-05-27 10:11:25 -0500
committerLuke Kanies <luke@madstop.com>2009-05-27 10:19:50 -0500
commitb0ef08bfdfe3a1cdb81aa7622de0807786b24e3f (patch)
tree6666a9d4c3cb28f3f6a352292de87757d4a071a3 /lib/puppet/application
parentb83b159b69e1952c20f23629fc1255069ad5abb0 (diff)
downloadpuppet-b0ef08bfdfe3a1cdb81aa7622de0807786b24e3f.tar.gz
puppet-b0ef08bfdfe3a1cdb81aa7622de0807786b24e3f.tar.xz
puppet-b0ef08bfdfe3a1cdb81aa7622de0807786b24e3f.zip
Fixing #2248 - --no-client correctly leaves off client
All of the settings were there, we just weren't doing anything about them. Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/application')
-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 7a92db11d..1f97043fa 100644
--- a/lib/puppet/application/puppetd.rb
+++ b/lib/puppet/application/puppetd.rb
@@ -229,7 +229,7 @@ Puppet::Application.new(:puppetd) do
enable_disable_client(@agent) if options[:enable] or options[:disable]
- @daemon.agent = agent
+ @daemon.agent = agent if options[:client]
# It'd be nice to daemonize later, but we have to daemonize before the
# waitforcert happens.