[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

James Turnbull james at lovedthanlost.net
Fri Jan 23 14:21:13 UTC 2009


The following commit has been merged in the master branch:
commit a4110a39f34506507e653c3cb2a8b092bd14de92
Author: Sean E. Millichamp <sean at bruenor.org>
Date:   Tue Sep 30 14:43:23 2008 -0400

    Add SELinux context reset after file writes in Puppet::Util::FileType

diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb
index 8dcb672..7e799b6 100755
--- a/lib/puppet/util/filetype.rb
+++ b/lib/puppet/util/filetype.rb
@@ -1,8 +1,13 @@
 # Basic classes for reading, writing, and emptying files.  Not much
 # to see here.
+
+require 'puppet/util/selinux'
+
 class Puppet::Util::FileType
     attr_accessor :loaded, :path, :synced
 
+    include Puppet::Util::SELinux
+
     class << self
         attr_accessor :name
         include Puppet::Util::ClassGen
@@ -109,6 +114,8 @@ class Puppet::Util::FileType
             tf.print text; tf.flush 
             FileUtils.cp(tf.path, @path) 
             tf.close
+            # If SELinux is present, we need to ensure the file has its expected context
+            set_selinux_default_context(@path)
         end
     end
 

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list