/[smeserver]/rpms/e-smith-ntp/sme10/e-smith-ntp-2.6.0-bz11008-bz8881-improve-systemd-driftfile.patch
ViewVC logotype

Diff of /rpms/e-smith-ntp/sme10/e-smith-ntp-2.6.0-bz11008-bz8881-improve-systemd-driftfile.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.2 by jpp, Fri Nov 27 04:29:39 2020 UTC Revision 1.10 by jpp, Mon Nov 30 02:37:28 2020 UTC
# Line 4  diff -Nur e-smith-ntp-2.6.0.old/root/etc Line 4  diff -Nur e-smith-ntp-2.6.0.old/root/etc
4  @@ -1,3 +1,3 @@  @@ -1,3 +1,3 @@
5   {   {
6  -    $OUT = "driftfile /etc/ntp/drift";  -    $OUT = "driftfile /etc/ntp/drift";
7  +    $OUT = "driftfile /var/lib/drift";  +    $OUT = "driftfile /var/lib/ntp/drift";
8   }   }
9  diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service  diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service
10  --- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service     1969-12-31 19:00:00.000000000 -0500  --- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/40service     1969-12-31 19:00:00.000000000 -0500
# Line 95  diff -Nur e-smith-ntp-2.6.0.old/createli Line 95  diff -Nur e-smith-ntp-2.6.0.old/createli
95  diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset  diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset
96  --- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset  1969-12-31 19:00:00.000000000 -0500  --- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset  1969-12-31 19:00:00.000000000 -0500
97  +++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset      2020-11-26 23:22:46.951000000 -0500  +++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset      2020-11-26 23:22:46.951000000 -0500
98  @@ -0,0 +1,13 @@  @@ -0,0 +1,14 @@
99  +# nut UPS specific subservices  +# nut UPS specific subservices
100  +{  +{
101  +my $status = $ntp{status} || 'disabled';  +my $status = $ntp{status} || 'disabled';
102  +  +
103  +if ($status eq 'enabled') {  +if ($status eq 'enabled') {
104  +        $OUT .= "disable        ntpdate.service";  +        $OUT .= "disable        ntpdate.service\n";
105  +        $OUT .= "enable         ntpd.service";  +        $OUT .= "enable         ntpd.service\n";
106  +  }  +  }
107  +else  +else
108  +  {  +  {
109  +        $OUT .= "disable       ntpdate.service";  +        $OUT .= "disable       ntpdate.service\n";
110  +        $OUT .= "disable       ntpd.service";  +        $OUT .= "disable       ntpd.service\n";
111  +  }  +  }
112    +}
113  diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install  diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install
114  --- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install     1969-12-31 19:00:00.000000000 -0500  --- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install     1969-12-31 19:00:00.000000000 -0500
115  +++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install 2020-11-26 23:26:16.570000000 -0500  +++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/usr/lib/systemd/system/ntpd.service.d/50koozali.conf/80install 2020-11-26 23:26:16.570000000 -0500
# Line 121  diff -Nur e-smith-ntp-2.6.0.old/root/etc Line 122  diff -Nur e-smith-ntp-2.6.0.old/root/etc
122  @@ -1,2 +0,0 @@  @@ -1,2 +0,0 @@
123  -enable ntpdate.service  -enable ntpdate.service
124  -enable ntpd.service  -enable ntpd.service
125    diff -Nur e-smith-ntp-2.6.0.old/createlinks e-smith-ntp-2.6.0/createlinks
126    --- e-smith-ntp-2.6.0.old/createlinks   2020-11-26 23:49:32.684000000 -0500
127    +++ e-smith-ntp-2.6.0/createlinks       2020-11-26 23:49:53.047000000 -0500
128    @@ -70,7 +70,6 @@
129    
130     event_link("systemd-default", $event, "10");
131     event_link("conf-timezone", $event, "30");
132    -event_link("set-time-date", $event, "40");
133     event_link("systemd-reload", $event, "50");
134    
135     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ntpd");
136    diff -Nur e-smith-ntp-2.6.0.old/root/usr/lib/systemd/system/ntpd.service.d/50koozali.conf e-smith-ntp-2.6.0/root/usr/lib/systemd/system/ntpd.service.d/50koozali.conf
137    --- e-smith-ntp-2.6.0.old/root/usr/lib/systemd/system/ntpd.service.d/50koozali.conf     2020-11-26 23:56:30.134000000 -0500
138    +++ e-smith-ntp-2.6.0/root/usr/lib/systemd/system/ntpd.service.d/50koozali.conf 1969-12-31 19:00:00.000000000 -0500
139    @@ -1,2 +0,0 @@
140    -[Service]
141    -MemoryLimit=250000
142    diff -Nur e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset
143    --- e-smith-ntp-2.6.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset  2020-11-27 09:37:05.531000000 -0500
144    +++ e-smith-ntp-2.6.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/80-koozali-ntp.preset      2020-11-27 09:38:47.124000000 -0500
145    @@ -1,14 +1,4 @@
146    -# nut UPS specific subservices
147    -{
148    -my $status = $ntp{status} || 'disabled';
149    +# nut ntpd specific subservices
150    +# this would conflict with ntpd
151    +disable        ntpdate.service
152    
153    -if ($status eq 'enabled') {
154    -        $OUT .= "disable        ntpdate.service\n";
155    -        $OUT .= "enable         ntpd.service\n";
156    -  }
157    -else
158    -  {
159    -        $OUT .= "disable       ntpdate.service\n";
160    -        $OUT .= "disable       ntpd.service\n";
161    -  }
162    -}

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed