Add variable to control Puppet's own diffing of various files.

puppet/manifests/init.pp

@@ -13,6 +13,10 @@ class puppet::client {
         $puppet_keylength = "2048"
     }
 
+    if ! $puppet_diffargs {
+        $puppet_diffargs = "-u"
+    }
+
     case $operatingsystem {
         openbsd: { $vardir = "/var/puppet" }
         default: { $vardir = "/var/lib/puppet" }

puppet/templates/puppet.conf.erb

@@ -39,6 +39,9 @@
     # The bit length of keys.
     keylength = <%= puppet_keylength %>
 
+    # Arguments for puppet's use of diff
+    diff_args = <%= puppet_diffargs %>
+
 <% if puppetversion[/\d+/].to_i >= 2 -%>
 [agent]
     # Ignore site manifest when run as agent. Fixes warnings about