OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Apr-2004 14:50:54
Branch: HEAD Handle: 2004040213505400
Modified files:
openpkg-src/dhcp-agent dhcp-agent.spec rc.dhcp-agent
Log:
correct rc status variable, and those passed to rcService from within
rc file as well
Summary:
Revision Changes Path
1.33 +2 -2 openpkg-src/dhcp-agent/dhcp-agent.spec
1.9 +13 -13 openpkg-src/dhcp-agent/rc.dhcp-agent
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/dhcp-agent.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 dhcp-agent.spec
--- openpkg-src/dhcp-agent/dhcp-agent.spec 7 Feb 2004 17:54:23 -0000 1.32
+++ openpkg-src/dhcp-agent/dhcp-agent.spec 2 Apr 2004 12:50:54 -0000 1.33
@@ -36,7 +36,7 @@
Group: Converter
License: MIT-style
Version: 0.41
-Release: 20040207
+Release: 20040402
# package options
%option with_fsl yes
@@ -158,7 +158,7 @@
# after upgrade, restart service
[ $1 -eq 2 ] || exit 0
eval `%{l_rc} dhcp-agent status 2>/dev/null`
- [ ".$dhcp-agent_active" = .yes ] && %{l_rc} dhcp-agent restart
+ [ ".$dhcp_agent_active" = .yes ] && %{l_rc} dhcp-agent restart
exit 0
%preun
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/rc.dhcp-agent
============================================================================
$ cvs diff -u -r1.8 -r1.9 rc.dhcp-agent
--- openpkg-src/dhcp-agent/rc.dhcp-agent 20 Oct 2003 15:49:03 -0000 1.8
+++ openpkg-src/dhcp-agent/rc.dhcp-agent 2 Apr 2004 12:50:54 -0000 1.9
@@ -21,9 +21,9 @@
%status -u @l_susr@ -o
dhcp_agent_usable="no"
dhcp_agent_active="no"
- rcService dhcp_agent enable yes && \
+ rcService dhcp-agent enable yes && \
[ ".$dhcp_agent_interface" != . ] && dhcp_agent_usable="yes"
- rcService dhcp_agent enable yes && \
+ rcService dhcp-agent enable yes && \
rcVarIsYes dhcp_agent_usable && \
dhcp_agent_signal 0 && dhcp_agent_active="yes"
echo "dhcp_agent_enable=\"$dhcp_agent_enable\""
@@ -31,31 +31,31 @@
echo "dhcp_agent_active=\"$dhcp_agent_active\""
%start -p 90 -u @l_susr@
- rcService dhcp_agent enable yes || exit 0
- rcService dhcp_agent active yes && exit 0
- rcService dhcp_agent usable && \
+ rcService dhcp-agent enable yes || exit 0
+ rcService dhcp-agent active yes && exit 0
+ rcService dhcp-agent usable && \
@l_prefix@/sbin/dhcp-client 2>/dev/null -i $dhcp_agent_interface
%stop -p 90 -u @l_susr@
- rcService dhcp_agent enable yes || exit 0
- rcService dhcp_agent active no && exit 0
- rcService dhcp_agent usable && \
+ rcService dhcp-agent enable yes || exit 0
+ rcService dhcp-agent active no && exit 0
+ rcService dhcp-agent usable && \
@l_prefix@/sbin/dhcp-client 2>/dev/null -k -i $dhcp_agent_interface
%restart -p 90 -u @l_susr@
- rcService dhcp_agent enable yes || exit 0
- rcService dhcp_agent active no && exit 0
+ rcService dhcp-agent enable yes || exit 0
+ rcService dhcp-agent active no && exit 0
rc dhcp-agent stop
sleep 2
rc dhcp-agent start
%reload -p 90 -u @l_susr@
- rcService dhcp_agent enable yes || exit 0
- rcVarIsYes dhcp_agent_usable && \
+ rcService dhcp-agent enable yes || exit 0
+ rcVarIsYes dhcp-agent_usable && \
@l_prefix@/sbin/dhcp-client 2>/dev/null -c -i $dhcp_agent_interface
%daily -u @l_susr@
- rcService dhcp_agent enable yes || exit 0
+ rcService dhcp-agent enable yes || exit 0
# rotate logfile
shtool rotate -f \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
