packages: ntp/ntp.spec - hack (from cronie) to avoid restarting with ntpd u...

[glen]

Author: glen                         Date: Mon Feb  8 22:59:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- hack (from cronie) to avoid restarting with ntpd user before config change trigger; rel 6

---- Files affected:
packages/ntp:
   ntp.spec (1.124 -> 1.125) 

---- Diffs:

================================================================
Index: packages/ntp/ntp.spec
diff -u packages/ntp/ntp.spec:1.124 packages/ntp/ntp.spec:1.125
--- packages/ntp/ntp.spec:1.124	Mon Feb  1 18:20:27 2010
+++ packages/ntp/ntp.spec	Mon Feb  8 23:59:31 2010
@@ -5,7 +5,7 @@
 Summary(pt_BR.UTF-8):	Network Time Protocol versão 4
 Name:		ntp
 Version:	4.2.4p8
-Release:	5
+Release:	6
 License:	distributable
 Group:		Daemons
 Source0:	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
@@ -317,16 +317,16 @@
 	%groupremove ntp
 fi
 
-%triggerpostun -n ntpd -- ntpd < 4.2.4p8-3.14
+%triggerun -n ntpd -- ntp < 4.2.4p8-3.14
+# Prevent preun from ntp from working
+chmod a-x /etc/rc.d/init.d/ntpd
+
+%triggerpostun -n ntpd -- ntp < 4.2.4p8-3.14
+# Restore what triggerun removed
+chmod 754 /etc/rc.d/init.d/ntpd
 sed -i -e 's,/etc/ntp/drift,/var/lib/ntp/drift,' %{_sysconfdir}/ntp.conf
-mv -f /etc/ntp/ntp.drift /var/lib/ntp/drift
-mv -f /etc/ntp/drift /var/lib/ntp/drift
-%service -q ntpd restart
-
-%triggerpostun -n ntpd -- ntp < 4.2.4p8-3.1
-sed -i -e 's,/etc/ntp/drift,/var/lib/ntp/drift,' %{_sysconfdir}/ntp.conf
-mv -f /etc/ntp/ntp.drift /var/lib/ntp/drift
-mv -f /etc/ntp/drift /var/lib/ntp/drift
+mv -f /etc/ntp/ntp.drift /var/lib/ntp/drift 2>/dev/null
+mv -f /etc/ntp/drift /var/lib/ntp/drift 2>/dev/null
 %service -q ntpd restart
 
 %triggerpostun -n ntpdate -- ntp-client < 4.2.4p8-3.2
@@ -385,6 +385,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.125  2010/02/08 22:59:31  glen
+- hack (from cronie) to avoid restarting with ntpd user before config change trigger; rel 6
+
 Revision 1.124  2010/02/01 17:20:27  glen
 - release 5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp.spec?r1=1.124&r2=1.125&f=u