fix check-puppet hourly cron job for Puppet 3

NEWS

@@ -3,6 +3,9 @@ release/004.003 (unreleased)
     [puppetclient] Only put the database account credentials in
     /etc/puppet/puppet.conf for the (old) Puppet 2.x servers. (adamhl)
 
+    [puppetclient] Update the check-puppet hourly cron job for
+    Puppet 3. (adamhl)
+
     [wallet] Change file permissions to 4-digit string, refactor, and fix
     puppet-lint warnings for base::wallet.
 

files/puppetclient/etc/cron.hourly/check-puppet

@@ -14,11 +14,13 @@ if [ -e $lockfile ]; then
     fi
 fi
 
-# Start puppet if there is no puppetd process running.
+# Start puppet if there is no puppet agent process running.
 if pgrep -f "ruby /usr/sbin/puppetd" > /dev/null ; then
     exit 0
 elif pgrep -f "ruby1.8 /usr/bin/puppet agent" > /dev/null ; then
     exit 0
+elif pgrep -f "/usr/bin/ruby /usr/bin/puppet agent" > /dev/null ; then
+    exit 0
 else
     if [ -e /etc/debian_version ] ; then
         invoke-rc.d puppet start 2>&1 > /dev/null