1 files changed, 1 insertions, 6 deletions
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]