Changes - j0ke.net Open Build Service

Changes of Revision 10

[-] [+]	Changed	softflowd.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat Dec 15 10:58:18 UTC 2012 - cs@linux-administrator.com + +- added softflowd-rh-init_sysconfig.patch + +------------------------------------------------------------------- Thu Dec 13 11:49:23 UTC 2012 - cs@linux-administrator.com - update to release 0.9.9
[-] [+]	Changed	softflowd.spec ^
@@ -6,6 +6,7 @@ Source1: %{name}.sysconfig Source2: %{name}.init Patch0: %{name}-chroot.patch +Patch1: %{name}-rh-init_sysconfig.patch Group: System/Utilities License: BSD BuildRoot: %{_tmppath}/%{name}-build @@ -31,6 +32,7 @@ %prep %setup %patch0 +%patch1 %build %configure --with-chrootdir=/var/lib/softflowd
[-] [+]	Added	softflowd-rh-init_sysconfig.patch ^
@@ -0,0 +1,80 @@ +--- softflowd.init.orig 2012-12-15 11:53:50.812038445 +0100 ++++ softflowd.init 2012-12-15 11:56:11.164041410 +0100 +@@ -8,34 +8,34 @@ + # Source function library. + . /etc/init.d/functions + +-SOFTFLOW_CONF=/etc/sysconfig/softflowd +-SOFTFLOW_LOCK=/var/lock/subsys/softflowd +-SOFTFLOW_PROG=/usr/sbin/softflowd +-SOFTFLOW_OPTS="-i eth0" ++SOFTFLOWD_CONFIG=/etc/sysconfig/softflowd ++SOFTFLOWD_LOCK=/var/lock/subsys/softflowd ++SOFTFLOWD_BIN=/usr/sbin/softflowd ++SOFTFLOWD_OPTIONS="-i eth0" + + # Source config +-if [ -f $SOFTFLOW_CONF ]; then +- . $SOFTFLOW_CONF ++if [ -f $SOFTFLOWD_CONFIG ]; then ++ . $SOFTFLOWD_CONFIG + fi + +-[ -x $SOFTFLOW_PROG ] \|\| exit 0 ++[ -x $SOFTFLOWD_BIN ] \|\| exit 0 + + RETVAL=0 + + start() { + echo -n $"Starting softflowd: " +- daemon $SOFTFLOW_PROG $SOFTFLOW_OPTS ++ daemon $SOFTFLOWD_BIN $SOFTFLOWD_OPTIONS + RETVAL=$? + echo +- [ $RETVAL -eq 0 ] && touch $SOFTFLOW_LOCK ++ [ $RETVAL -eq 0 ] && touch $SOFTFLOWD_LOCK + return $RETVAL + } + stop() { + echo -n $"Shutting down softflowd: " +- killproc $SOFTFLOW_PROG ++ killproc $SOFTFLOWD_BIN + RETVAL=$? + echo +- [ $RETVAL -eq 0 ] && rm -f $SOFTFLOW_LOCK ++ [ $RETVAL -eq 0 ] && rm -f $SOFTFLOWD_LOCK + return $RETVAL + } + restart() { +@@ -51,13 +51,13 @@ + stop + ;; + status) +- status $SOFTFLOW_PROG ++ status $SOFTFLOWD_BIN + ;; + restart\|reload) + restart + ;; + condrestart) +- [ -f $SOFTFLOW_LOCK ] && restart \|\| : ++ [ -f $SOFTFLOWD_LOCK ] && restart \|\| : + ;; + *) + echo $"Usage: $0 {start\|stop\|status\|restart\|condrestart}" +--- softflowd.sysconfig.orig 2012-12-15 11:56:22.820038813 +0100 ++++ softflowd.sysconfig 2012-12-15 11:56:45.764040656 +0100 +@@ -1,10 +1,10 @@ + # Config file for softflowd startup + + # Location of softflowd binary +-#SOFTFLOW_PROG=/usr/sbin/softflowd ++#SOFTFLOW_BIN=/usr/sbin/softflowd + + # Options passed to the softflowd program + # Default - not very useful +-#SOFTFLOW_OPTS="-i eth0" ++#SOFTFLOW_OPTIONS="-i eth0" + # Example NetFlow v5 export from traffic on eth1 +-#SOFTFLOW_OPTS="-v 5 -i eth1 -n hostname:2055" ++#SOFTFLOW_OPTIONS="-v 5 -i eth1 -n hostname:2055"