[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, squeeze-2.6.2, updated. debian/2.6.2-2-9-gcbbc2fd

[Micah Anderson]

The following commit has been merged in the squeeze-2.6.2 branch:
commit cbbc2fd82178c4e678930741c46130e8756002e8
Author: Micah Anderson <micah at riseup.net>
Date:   Thu Dec 2 19:25:07 2010 -0500

    make puppetqd honor PUPPETQD_OPTS from /etc/default/puppetqd (Closes: #605510)
    
    Conflicts:
    
    	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 3758d00..93cf15d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ puppet (2.6.2-3) unstable; urgency=high
   * Fix remote resource vulnerability when auth.conf is missing
 
   [ Micah Anderson ]
+  * Make puppetqd honor flags from /etc/default/puppetqd (Closes: #605510)
   * Remove the puppetqd PID file on stop (Closes: #605512)
   * Add ext/puppetstoredconfigclean to puppetmaster:/usr/sbin
   * Patch ext/logcheck/puppet to handle new puppet-master 
diff --git a/debian/puppetmaster.puppetqd.init b/debian/puppetmaster.puppetqd.init
index 802629f..a7d47b0 100644
--- a/debian/puppetmaster.puppetqd.init
+++ b/debian/puppetmaster.puppetqd.init
@@ -37,7 +37,7 @@ is_true() {
 start_puppet_queue() {
     if is_true "$PUPPETQD" ; then
 	start-stop-daemon --start --quiet --pidfile=${PIDFILE} \
-	    --startas $DAEMON -- $NAME $DAEMON_OPTS
+	    --startas $DAEMON -- $NAME $DAEMON_OPTS $PUPPETQD_OPTS
     fi
 }
 

-- 
Puppet packaging for Debian