/[smecontribs]/rpms/smeserver-zoneminder/contribs10/smeserver-zoneminder-1.0-Update-for-SME10-systemd.patch
ViewVC logotype

Contents of /rpms/smeserver-zoneminder/contribs10/smeserver-zoneminder-1.0-Update-for-SME10-systemd.patch

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


Revision 1.2 - (show annotations) (download)
Tue Feb 16 18:34:45 2021 UTC (3 years, 8 months ago) by brianr
Branch: MAIN
CVS Tags: smeserver-zoneminder-1_0-13_el7_sme, smeserver-zoneminder-1_0-12_el7_sme, HEAD
Changes since 1.1: +3 -3 lines
Error occurred while calculating annotation data.
* Tue Feb 16 2021 Brian Read <brianr@bjsystems.co.uk> 1.0-11.sme
- Update for systemd changes [SME: 11226]

1 diff -urN smeserver-zoneminder-1.0.old/createlinks smeserver-zoneminder-1.0/createlinks
2 --- smeserver-zoneminder-1.0.old/createlinks 2021-02-16 10:40:17.775163164 +0000
3 +++ smeserver-zoneminder-1.0/createlinks 2021-02-16 11:43:05.851230706 +0000
4 @@ -4,7 +4,7 @@
5 my $event;
6
7 # Runlevel init links.
8 -service_link_enhanced("zoneminder", "S99", "7");
9 +#service_link_enhanced("zoneminder", "S99", "7");
10
11
12
13 @@ -14,7 +14,7 @@
14 templates2events("/etc/httpd/conf/httpd.conf", $event);
15 templates2events("/etc/zm/zm.conf", $event);
16 event_link("zoneminder", $event, "10");
17 -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
18 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
19
20 # add expand zm.conf
21 foreach my $event (qw(post-upgrade bootstrap-console-save console-save remoteaccess-update php-update webapps-update)){
22 @@ -22,4 +22,28 @@
23 event_link("zoneminder", $event, "10");
24 }
25
26 +# our event specific for updating with yum without reboot
27 +$event = "smeserver-zoneminder-update";
28 +#add here the path to your templates needed to expand
29 +#see the /etc/systemd/system-preset/49-koozali.preset should be present for systemd integration on all you yum update event
30 +
31 +foreach my $file (qw(
32 + /etc/systemd/system-preset/49-koozali.preset
33 + /etc/zm/zm.conf
34 + /etc/httpd/conf/httpd.conf
35 + /etc/e-smith/sql/init/30zoneminder
36 +))
37 +{
38 + templates2events( $file, $event );
39 +}
40
41 +#action needed in case we have a systemd unit
42 +event_link("systemd-default", $event, "10");
43 +event_link("systemd-reload", $event, "50");
44 +
45 +#action specific to this package
46 +#event_link("conf-timezone", $event, "30");
47 +#services we need to restart
48 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
49 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
50 +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zoneminder")
51 diff -urN smeserver-zoneminder-1.0.old/root/usr/lib/systemd/system/zoneminder.service.d/50koozali.conf smeserver-zoneminder-1.0/root/usr/lib/systemd/system/zoneminder.service.d/50koozali.conf
52 --- smeserver-zoneminder-1.0.old/root/usr/lib/systemd/system/zoneminder.service.d/50koozali.conf 1970-01-01 01:00:00.000000000 +0100
53 +++ smeserver-zoneminder-1.0/root/usr/lib/systemd/system/zoneminder.service.d/50koozali.conf 2021-02-16 18:28:16.594787405 +0000
54 @@ -0,0 +1,6 @@
55 +[Unit]
56 +#After=wan.service
57 +#After=networking.service
58 +[Install]
59 +WantedBy=sme-server.target
60 +

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