[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Update puppet in stable



Hello,

There is one particularly annoying issue that has come up with puppet
since the release. That issue, #573551, has to do with dependency-based
boot scripts and how puppet disables/enables services, it simply doesn't
work properly in Squeeze.

One other trivial fix is included, an adjustment to the puppet
initscript LSB header to fix the name.

Please find below the diffs, if the release team approves, I will upload
to stable.

Thanks!

commit ad00e93381ce79173602f67d0fb2375535a74a96
Author: Micah Anderson <micah@riseup.net>
Date:   Thu Mar 3 12:52:33 2011 -0500

    update changelog to reflect the two cherry-picked issues

diff --git a/debian/changelog b/debian/changelog
index 56f05f7..7844f7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+puppet (2.6.2-5) stable; urgency=low
+
+  [ Micah Anderson ]
+  * Use update-rc.d enable/disable in the "debian" provider for the 
+    "service" type, thanks madduck! (Closes: #573551)
+  * Update Should-Start header for the puppet initscript
+
+ -- Micah Anderson <micah@debian.org>  Thu, 03 Mar 2011 12:50:18 -0500
+
 puppet (2.6.2-4) unstable; urgency=low
 
   * Normalize parameterized classes (Closes: #607294)

commit 8d41bb0da2520e2236a524ab17fe6b5b0a6a9812
Author: Micah Anderson <micah@riseup.net>
Date:   Thu Mar 3 12:48:26 2011 -0500

    update Should-Start header for the puppet initscript
    
    Conflicts:
    
        debian/changelog

diff --git a/debian/puppet.init b/debian/puppet.init
index d6b4fb0..7791229 100644
--- a/debian/puppet.init
+++ b/debian/puppet.init
@@ -3,7 +3,7 @@
 # Provides:          puppet
 # Required-Start:    $network $named $remote_fs $syslog
 # Required-Stop:     $network $named $remote_fs $syslog
-# Should-Start:      puppetmaster
+# Should-Start:      puppet
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 ### END INIT INFO                                                                                               

commit 6331667960185967d1355dba5253096c9939e33f
Author: martin f krafft <madduck@debian.org>
Date:   Sat Jan 15 18:57:53 2011 +0100

    Use update-rc.d enable/disable in the "debian" provider in the "service" type (Closes: #573551)

diff --git a/lib/puppet/provider/service/debian.rb b/lib/puppet/provider/service/debian.rb
index 3d09e28..f3ab221 100755
--- a/lib/puppet/provider/service/debian.rb
+++ b/lib/puppet/provider/service/debian.rb
@@ -23,7 +23,7 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
   # Remove the symlinks
   def disable
     update_rc "-f", @resource[:name], "remove"
-    update_rc @resource[:name], "stop", "00", "1", "2", "3", "4", "5", "6", "."
+    update_rc @resource[:name], "disable"
   end
 
   def enabled?
@@ -43,6 +43,6 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
 
   def enable
     update_rc "-f", @resource[:name], "remove"
-    update_rc @resource[:name], "defaults"
+    update_rc @resource[:name], "enable"
   end
 end



-- 

Attachment: pgpXZfdhUdjsy.pgp
Description: PGP signature


Reply to: