OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 20-Oct-2003 17:49:03
Branch: HEAD Handle: 2003102016490102
Modified files:
openpkg-src/dhcp-agent dhcp-agent.spec fsl.dhcp-agent rc.dhcp-agent
openpkg-web news.txt
Log:
Implement features in ticket #202, but don't test because it's too
broken
Summary:
Revision Changes Path
1.28 +15 -1 openpkg-src/dhcp-agent/dhcp-agent.spec
1.3 +1 -1 openpkg-src/dhcp-agent/fsl.dhcp-agent
1.8 +5 -2 openpkg-src/dhcp-agent/rc.dhcp-agent
1.7086 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/dhcp-agent.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 dhcp-agent.spec
--- openpkg-src/dhcp-agent/dhcp-agent.spec 18 Sep 2003 14:56:57 -0000 1.27
+++ openpkg-src/dhcp-agent/dhcp-agent.spec 20 Oct 2003 15:49:03 -0000 1.28
@@ -35,7 +35,7 @@
Group: Converter
License: MIT-style
Version: 0.41
-Release: 20030918
+Release: 20031020
# package options
%option with_fsl yes
@@ -145,4 +145,18 @@
%clean
rm -rf $RPM_BUILD_ROOT
+
+%post
+ # 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
+ exit 0
+
+%preun
+ # before erase, stop service
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} dhcp-agent stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/dhcp-agent/*.log* >/dev/null 2>&1 || true
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/fsl.dhcp-agent
============================================================================
$ cvs diff -u -r1.2 -r1.3 fsl.dhcp-agent
--- openpkg-src/dhcp-agent/fsl.dhcp-agent 14 Jul 2003 18:32:20 -0000 1.2
+++ openpkg-src/dhcp-agent/fsl.dhcp-agent 20 Oct 2003 15:49:03 -0000 1.3
@@ -9,7 +9,7 @@
-> {
debug: file(
path="@l_prefix@/var/dhcp-agent/dhcp-agent.log",
- perm=0644
+ perm=0644, monitor=3600
)
}
};
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dhcp-agent/rc.dhcp-agent
============================================================================
$ cvs diff -u -r1.7 -r1.8 rc.dhcp-agent
--- openpkg-src/dhcp-agent/rc.dhcp-agent 22 Jul 2003 13:18:04 -0000 1.7
+++ openpkg-src/dhcp-agent/rc.dhcp-agent 20 Oct 2003 15:49:03 -0000 1.8
@@ -32,16 +32,19 @@
%start -p 90 -u @l_susr@
rcService dhcp_agent enable yes || exit 0
- rcVarIsYes dhcp_agent_usable && \
+ 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
- rcVarIsYes dhcp_agent_usable && \
+ 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
rc dhcp-agent stop
sleep 2
rc dhcp-agent start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7085 -r1.7086 news.txt
--- openpkg-web/news.txt 20 Oct 2003 13:48:28 -0000 1.7085
+++ openpkg-web/news.txt 20 Oct 2003 15:49:01 -0000 1.7086
@@ -1,3 +1,4 @@
+20-Oct-2003: Upgraded package: P<dhcp-agent-0.41-20031020>
20-Oct-2003: Upgraded package: P<dcron-2.9-20031020>
20-Oct-2003: Upgraded package: P<fsl-1.3.0-20031020>
20-Oct-2003: Upgraded package: P<openpkg-20031020-20031020>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
