/[smecontribs]/rpms/smeserver-ddclient/contribs10/smeserver-ddclient-1.3.0-Fix-ppoe-restart-and-expand-template-for-bootstrap-and-console-save.patch
ViewVC logotype

Contents of /rpms/smeserver-ddclient/contribs10/smeserver-ddclient-1.3.0-Fix-ppoe-restart-and-expand-template-for-bootstrap-and-console-save.patch

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


Revision 1.1 - (show annotations) (download)
Wed May 8 09:22:25 2024 UTC (6 months, 2 weeks ago) by brianr
Branch: MAIN
CVS Tags: smeserver-ddclient-1_3_0-34_el7_sme, smeserver-ddclient-1_3_0-33_el7_sme, HEAD
Error occurred while calculating annotation data.
* Wed May 08 2024 Brian Read <brianr@koozali.org> 1.3.0-33.sme
- change command on ppoe up to use systemd [SME: 12676 ]
- Add console-save and bootrap-console-save to expand template take out post-upgrade [SME: 12675 ]

1 diff -urN smeserver-ddclient-1.3.0.old/createlinks smeserver-ddclient-1.3.0/createlinks
2 --- smeserver-ddclient-1.3.0.old/createlinks 2024-05-08 08:01:27.452908697 +0100
3 +++ smeserver-ddclient-1.3.0/createlinks 2024-05-08 08:16:25.545816922 +0100
4 @@ -45,9 +45,17 @@
5 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ddclient");
6 templates2events("/etc/ddclient/ddclient.conf", $event);
7
8 -$event = 'post-upgrade';
9 +$event = 'bootstrap-console-save';
10 + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ddclient");
11 templates2events("/etc/ddclient/ddclient.conf", $event);
12 - templates2events("/etc/ppp/ip-up.local", $event);
13 +
14 +$event = 'console-save';
15 + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ddclient");
16 + templates2events("/etc/ddclient/ddclient.conf", $event);
17 +
18 +#$event = 'post-upgrade';
19 +# templates2events("/etc/ddclient/ddclient.conf", $event);
20 +# templates2events("/etc/ppp/ip-up.local", $event);
21
22 # and create an empty cache
23 # safe_touch("/var/cache/ddclient/ddclient.cache")
24 diff -urN smeserver-ddclient-1.3.0.old/root/etc/e-smith/templates/etc/ppp/ip-up.local/45ddclient smeserver-ddclient-1.3.0/root/etc/e-smith/templates/etc/ppp/ip-up.local/45ddclient
25 --- smeserver-ddclient-1.3.0.old/root/etc/e-smith/templates/etc/ppp/ip-up.local/45ddclient 2024-05-08 08:01:27.391906880 +0100
26 +++ smeserver-ddclient-1.3.0/root/etc/e-smith/templates/etc/ppp/ip-up.local/45ddclient 2024-05-08 08:06:50.693591171 +0100
27 @@ -2,11 +2,12 @@
28 # [ -x /etc/ppp/ddclient_ip-up.local ] && /etc/ppp/ddclient_ip-up.local "$@"
29 # [ -x /etc/rc.d/init.d/ddclient ] && /etc/rc.d/init.d/ddclient restart
30 {
31 -$debug = (($ddclient{'debug'} eq 'enabled') ? "debug" : "nodebug");
32 -$verbose = (($ddclient{'verbose'} eq 'enabled') ? "verbose" : "noverbose");
33 -$quiet = (($ddclient{'quiet'} eq 'enabled') ? "quiet" : "noquiet");
34 -$syslog = (($ddclient{'syslog'} eq "enabled") ? "syslog" : "nosyslog");
35 -$OUT .= "\/usr\/sbin\/ddclient -file \/etc\/ddclient\/ddclient.conf -$debug -$verbose -$quiet -$syslog -pid \/var\/run\/ddclient\/ddclient.pid";
36 +#$debug = (($ddclient{'debug'} eq 'enabled') ? "debug" : "nodebug");
37 +#$verbose = (($ddclient{'verbose'} eq 'enabled') ? "verbose" : "noverbose");
38 +#$quiet = (($ddclient{'quiet'} eq 'enabled') ? "quiet" : "noquiet");
39 +#$syslog = (($ddclient{'syslog'} eq "enabled") ? "syslog" : "nosyslog");
40 +$OUT= "/usr/bin/systemctl reload-or-restart ddclient" if ( ($ddclient{status}||"disabled") eq "enabled" );
41 +#$OUT .= "\/usr\/sbin\/ddclient -file \/etc\/ddclient\/ddclient.conf -$debug -$verbose -$quiet -$syslog -pid \/var\/run\/ddclient\/ddclient.pid";
42 $OUT .= "\n";
43 }
44
45 diff -urN smeserver-ddclient-1.3.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ddclient.service.d/50koozali.conf/20Service smeserver-ddclient-1.3.0/root/etc/e-smith/templates/usr/lib/systemd/system/ddclient.service.d/50koozali.conf/20Service
46 --- smeserver-ddclient-1.3.0.old/root/etc/e-smith/templates/usr/lib/systemd/system/ddclient.service.d/50koozali.conf/20Service 2024-05-08 08:01:27.453908727 +0100
47 +++ smeserver-ddclient-1.3.0/root/etc/e-smith/templates/usr/lib/systemd/system/ddclient.service.d/50koozali.conf/20Service 2024-05-08 10:05:14.600398021 +0100
48 @@ -9,6 +9,7 @@
49 $OUT .= "Group=ddclient\n";
50 $OUT .= "Type=forking\n";
51 $OUT .= "EnvironmentFile=-\/etc\/sysconfig\/ddclient\n";
52 +$OUT .= "ExecReload=/usr/bin/kill -HUP \$MAINPID\n";
53 $OUT .= "ExecStartPre=\n";
54 $OUT .= "ExecStartPre=\/bin\/touch \/var\/cache\/ddclient\/ddclient.cache\n";
55 $OUT .= "ExecStart=\n";

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed