File puppet-0.25.4-init.diff of Package puppet

Index: conf/suse/client.init
===================================================================
--- conf/suse/client.init.orig
+++ conf/suse/client.init
@@ -13,9 +13,9 @@
 
 ### BEGIN INIT INFO
 # Provides: puppet
-# Required-Start: $local_fs $network $syslog
+# Required-Start: $local_fs $remote_fs $network $syslog
 # Should-Start:
-# Required-Stop:
+# Required-Stop: $local_fs $remote_fs $network $syslog
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 # Short-Description: puppet
@@ -32,14 +32,12 @@
 #      rc_exit          exit appropriate to overall rc status
 [ -f /etc/rc.status ] && . /etc/rc.status
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
-lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet.pid}
-puppetd=${PUPPETD-/usr/sbin/puppetd}
+lockfile=/var/lock/subsys/puppet
+pidfile=/var/run/puppet.pid
+puppetd=/usr/sbin/puppetd
 
 PUPPET_OPTS=""
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
-[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
 
 # First reset status of this service
 rc_reset
Index: conf/suse/server.init
===================================================================
--- conf/suse/server.init.orig
+++ conf/suse/server.init
@@ -11,9 +11,9 @@
 
 ### BEGIN INIT INFO
 # Provides: puppetmaster
-# Required-Start: $local_fs $network $syslog
+# Required-Start: $local_fs $remote_fs $network $syslog
 # Should-Start:
-# Required-Stop:
+# Required-Stop: $local_fs $remote_fs $network $syslog
 # Default-Start: 3 4 5
 # Default-Stop: 0 1 2 6
 # Short-Description: puppetmaster
@@ -29,7 +29,7 @@
 #      rc_reset         clear local rc status (overall remains)
 #      rc_exit          exit appropriate to overall rc status
 
-lockfile=/var/lock/subsys/puppetmaster
+lockfile=/var/lock/subsys/puppetmasterd
 pidfile=/var/run/puppet/puppetmasterd.pid
 
 # Source function library.
@@ -45,10 +45,6 @@ PUPPETMASTER_OPTS="
     --manifest=$PUPPETMASTER_MANIFEST \
     --logdest=${PUPPETMASTER_LOG} \
     ${PUPPETMASTER_EXTRA_OPTS}"
-PUPPET_OPTS=""
-[ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
-[ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
-[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
 
 prog=puppetmasterd
 PUPPETMASTER=/usr/sbin/$prog