/[smeserver]/rpms/smeserver-yum/sme10/smeserver-yum-2.6.0-bz11180-yum-dbupdate-systemd.patch
ViewVC logotype

Annotation of /rpms/smeserver-yum/sme10/smeserver-yum-2.6.0-bz11180-yum-dbupdate-systemd.patch

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


Revision 1.5 - (hide annotations) (download)
Wed Dec 9 05:42:41 2020 UTC (3 years, 10 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-yum-2_6_0-60_el7_sme, smeserver-yum-2_6_0-48_el7_sme, smeserver-yum-2_6_0-46_el7_sme, smeserver-yum-2_6_0-52_el7_sme, smeserver-yum-2_6_0-62_el7_sme, smeserver-yum-2_6_0-49_el7_sme, smeserver-yum-2_6_0-44_el7_sme, smeserver-yum-2_6_0-47_el7_sme, smeserver-yum-2_6_0-51_el7_sme, smeserver-yum-2_6_0-45_el7_sme, smeserver-yum-2_6_0-50_el7_sme, smeserver-yum-2_6_0-61_el7_sme, smeserver-yum-2_6_0-64_el7_sme, smeserver-yum-2_6_0-58_el7_sme, smeserver-yum-2_6_0-55_el7_sme, smeserver-yum-2_6_0-57_el7_sme, smeserver-yum-2_6_0-54_el7_sme, smeserver-yum-2_6_0-42_el7_sme, smeserver-yum-2_6_0-56_el7_sme, smeserver-yum-2_6_0-53_el7_sme, smeserver-yum-2_6_0-43_el7_sme, smeserver-yum-2_6_0-59_el7_sme, smeserver-yum-2_6_0-63_el7_sme
Changes since 1.4: +1 -16 lines
* Tue Dec 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-42.sme
- move yum upate db service to systemd [SME: 11180]

1 jpp 1.1 diff -Nur smeserver-yum-2.6.0.old/createlinks smeserver-yum-2.6.0/createlinks
2     --- smeserver-yum-2.6.0.old/createlinks 2020-12-08 22:55:14.254000000 -0500
3     +++ smeserver-yum-2.6.0/createlinks 2020-12-08 23:28:27.655000000 -0500
4 jpp 1.5 @@ -32,7 +32,11 @@
5 jpp 1.1 }
6    
7     -safe_symlink("once", "root/etc/e-smith/events/local/services2adjust/yum");
8     +safe_symlink("restart", "root/etc/e-smith/events/local/services2adjust/yum");
9    
10     +my $event= "smeserver-yum-update";
11     +# systemd-specific action mandatory for this package-update event
12     +event_link("systemd-reload", $event, "89");
13     +event_link("systemd-default", $event, "88");
14    
15     #--------------------------------------------------
16     # functions for manager panel
17     diff -Nur smeserver-yum-2.6.0.old/root/etc/cron.daily/smeserver-yum smeserver-yum-2.6.0/root/etc/cron.daily/smeserver-yum
18     --- smeserver-yum-2.6.0.old/root/etc/cron.daily/smeserver-yum 2008-10-07 10:25:45.000000000 -0400
19     +++ smeserver-yum-2.6.0/root/etc/cron.daily/smeserver-yum 2020-12-08 23:24:30.963000000 -0500
20     @@ -23,5 +23,5 @@
21    
22     [ $yum_status = 'enabled' ] || exit 0
23    
24     -/usr/bin/sv o /service/yum
25     +/usr/bin/systemctl restart yum.service
26    
27     diff -Nur smeserver-yum-2.6.0.old/root/etc/e-smith/events/actions/yum-update-dbs smeserver-yum-2.6.0/root/etc/e-smith/events/actions/yum-update-dbs
28     --- smeserver-yum-2.6.0.old/root/etc/e-smith/events/actions/yum-update-dbs 2005-09-25 22:30:54.000000000 -0400
29     +++ smeserver-yum-2.6.0/root/etc/e-smith/events/actions/yum-update-dbs 2020-12-08 23:17:10.008000000 -0500
30     @@ -21,5 +21,5 @@
31     # XXX - FIXME - We should be able to do this with a link
32     # /etc/e-smith/events/local/services2adjust/yum -> once
33     # but that never seems to terminate
34     -exec /usr/local/bin/svc -o /service/yum
35 jpp 1.4 +exec /usr/bin/systemctl restart yum.service &
36 jpp 1.1
37     diff -Nur smeserver-yum-2.6.0.old/root/sbin/e-smith/check4updates smeserver-yum-2.6.0/root/sbin/e-smith/check4updates
38     --- smeserver-yum-2.6.0.old/root/sbin/e-smith/check4updates 2020-12-08 22:55:14.233000000 -0500
39     +++ smeserver-yum-2.6.0/root/sbin/e-smith/check4updates 2020-12-08 23:07:22.069000000 -0500
40     @@ -23,7 +23,7 @@
41     /usr/sbin/yum-cron /etc/yum/yum-cron.conf >> $TMPFILE
42     #cat $TMP1 >> $TMPFILE
43     # we have updates, let's inform the server-manager
44     - /usr/bin/sv o yum
45     + /usr/bin/systemctl restart yum.service
46    
47     fi
48    
49     diff -Nur smeserver-yum-2.6.0.old/root/usr/lib/systemd/system/yum.service smeserver-yum-2.6.0/root/usr/lib/systemd/system/yum.service
50     --- smeserver-yum-2.6.0.old/root/usr/lib/systemd/system/yum.service 1969-12-31 19:00:00.000000000 -0500
51     +++ smeserver-yum-2.6.0/root/usr/lib/systemd/system/yum.service 2020-12-08 23:06:03.287000000 -0500
52     @@ -0,0 +1,13 @@
53     +[Unit]
54     +Description=Yum db updater for Koozali SME Server
55     +After=network-pre.target networking.service sme-server.target
56     +
57     +[Service]
58     +Type=oneshot
59     +ExecStartPre=/sbin/e-smith/service-status yum
60     +ExecStart=/sbin/e-smith/yum_update_dbs
61     +RemainAfterExit=yes
62     +
63 jpp 1.3 +[Install]
64 jpp 1.1 +# do not install with sme-server.target, this service will be launched by others
65     +# including Koozali SME Server local.service

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