Fixing #245, opened by marthag.

Every other executable parsed the config file before calling
genconfig, but puppetd reversed it for some reason.



git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1646 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 3 insertions, 3 deletions

diff --git a/bin/puppetd b/bin/puppetd
index e0f7d2e1e..cf63f53a6 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -269,14 +269,14 @@ rescue GetoptLong::InvalidOption => detail
     exit(1)
 end
 
-Puppet.genconfig
-Puppet.genmanifest
-
 # Now parse the config
 if Puppet[:config] and File.exists? Puppet[:config]
     Puppet.config.parse(Puppet[:config])
 end
 
+Puppet.genconfig
+Puppet.genmanifest
+
 # Default to daemonizing, but if verbose or debug is specified,
 # default to staying in the foreground.
 unless options.include?(:daemonize)