diff --git a/conserver/conserver.spec b/conserver/conserver.spec index ab96966..6147619 100644 --- a/conserver/conserver.spec +++ b/conserver/conserver.spec @@ -11,7 +11,7 @@ # hostname (console) %define master console -%define distver 6 +%define distver 7 Summary: Serial console server daemon/client Name: %{pkg} diff --git a/conserver/initscript.patch b/conserver/initscript.patch index fa44289..556c7d2 100644 --- a/conserver/initscript.patch +++ b/conserver/initscript.patch @@ -1,10 +1,20 @@ diff -urN conserver-8.1.16/contrib/redhat-rpm/conserver.init conserver-8.1.16-diffinit/contrib/redhat-rpm/conserver.init --- conserver-8.1.16/contrib/redhat-rpm/conserver.init 2003-02-27 21:06:50.000000000 -0500 -+++ conserver-8.1.16-diffinit/contrib/redhat-rpm/conserver.init 2008-06-19 10:24:49.000000000 -0400 -@@ -6,15 +6,38 @@ ++++ conserver-8.1.16-diffinit/contrib/redhat-rpm/conserver.init 2008-06-26 10:59:51.000000000 -0400 +@@ -6,15 +6,48 @@ # description: conserver is a serial-port console daemon # config: /etc/conserver.cf # ++RHSuccess() ++{ ++ success ++ echo ++} ++RHFailure() ++{ ++ failure ++ echo ++} +MStatus() +{ + ps ax|grep -v grep|grep conserver >& /dev/null @@ -30,8 +40,8 @@ diff -urN conserver-8.1.16/contrib/redhat-rpm/conserver.init conserver-8.1.16-di +if [ -f /etc/rc.d/init.d/functions ]; then + . /etc/rc.d/init.d/functions + DAEMON=daemon -+ SUCCESS=success -+ FAILURE=failure ++ SUCCESS=RHSuccess ++ FAILURE=RHFailure + PASSED=passed + STATUS=status +elif [ -f /lib/lsb/init-functions ]; then @@ -47,7 +57,7 @@ diff -urN conserver-8.1.16/contrib/redhat-rpm/conserver.init conserver-8.1.16-di # make sure conserver is installed and executable [ -x /usr/sbin/conserver ] || exit 1 -@@ -24,22 +47,49 @@ +@@ -24,22 +57,49 @@ case "$1" in start) echo -n "Starting conserver: "