[2819] make drakclock systemd compatible

[root-odJJhXpcy38dnm+]

Revision: 2819
Author: dmorgan
Date: 2012-01-26 12:50:49 +0100 (Thu, 26 Jan 2012)
Log Message:
-----------
make drakclock systemd compatible

Modified Paths:
--------------
drakx/trunk/perl-install/NEWS
drakx/trunk/perl-install/standalone/drakclock

Modified: drakx/trunk/perl-install/NEWS
===================================================================
--- drakx/trunk/perl-install/NEWS 2012-01-26 08:38:50 UTC (rev 2818)
+++ drakx/trunk/perl-install/NEWS 2012-01-26 11:50:49 UTC (rev 2819)
@@ -1,3 +1,5 @@
+- make drakclock systemd compatible
+
Version 13.79 - 25 January 2012

- silent failure to extract gz modules (for rescue)

Modified: drakx/trunk/perl-install/standalone/drakclock
===================================================================
--- drakx/trunk/perl-install/standalone/drakclock 2012-01-26 08:38:50 UTC (rev 2818)
+++ drakx/trunk/perl-install/standalone/drakclock 2012-01-26 11:50:49 UTC (rev 2819)
@@ -25,6 +25,7 @@

my $ntpfile = '/etc/ntp.conf';
my $ntpdlock = '/var/lock/subsys/ntpd';
+my $ntpdsystemdlock = '/sys/fs/cgroup/systemd/system/ntpd.service';

my $my_win = ugtk2->new(N("Date, Clock & Time Zone Settings"));

@@ -132,6 +133,10 @@
system(qw(service ntpd stop));
system(qw(/sbin/chkconfig --level 35 ntpd off));
}
+ elsif (-e $ntpdsystemdlock) {
+ system(qw(systemctl stop ntpd.service));
+ system(qw(systemctl disable ntpd.service));
+ }
}
if ($need_date) {
my ($year, $month, $day) = $calendar->get_date;
@@ -163,7 +168,7 @@

my $servers = get_server();
$combo_ntpserver->set_popdown_strings(@$servers);
-if (-e $ntpfile && -e $ntpdlock) {
+if (-e $ntpfile && ( -e $ntpdsystemdlock || -e $ntpdlock)) {
$ntp = timezone::ntp_server();
$ntp and ntp_widget_state(1);
my $fullntp = $ntp;