1 files changed, 15 insertions, 3 deletions
diff --git a/bin/puppetd b/bin/puppetd
index 6d2b804b0..c082e2a80 100755
--- a/bin/puppetd
+++ b/bin/puppetd
@@ -259,11 +259,23 @@ end
 client.setcerts
 
 trap(:INT) {
-    exit(1)
+    client.shutdown
 }
 
-client.run(onetime)
+if onetime
+    begin
+        client.run
+    rescue => detail
+        Puppet.err detail.to_s
+        if Puppet[:debug]
+            puts detail.backtrace
+        end
+    end
+else
+    client.start
 
-#Puppet.join
+    # Mmm, hackish
+    Puppet.start
+end
 
 # $Id$