From 82b02b90493f0abc173ec4cc09948106ae5190cd Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Thu, 28 Feb 2008 14:49:32 -0600
Subject: Fixing #1101 -- puppetrun works again.

---
 bin/puppetrun | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/puppetrun b/bin/puppetrun
index c92b59fc6..d0823b9c5 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -274,12 +274,7 @@ else
 end
 
 # Now parse the config
-config = File.join(Puppet[:confdir], "puppet.conf")
-Puppet.parse_config(config)
-
-if File.exists? config
-    Puppet.settings.parse(config)
-end
+Puppet.parse_config
 
 if Puppet[:node_terminus] = "ldap"
     if options[:all]
-- 
cgit