Contents of /trunk/keepalived/patches/keepalived-2.0.13-confd.patch
Parent Directory | Revision Log
Revision 3324 -
(show annotations)
(download)
Mon Mar 18 15:22:57 2019 UTC (5 years, 6 months ago) by niro
File size: 2954 byte(s)
Mon Mar 18 15:22:57 2019 UTC (5 years, 6 months ago) by niro
File size: 2954 byte(s)
-added conf.d patch
1 | diff -Naur keepalived-2.0.13/keepalived/etc/init/keepalived.conf.in keepalived-2.0.13-confd/keepalived/etc/init/keepalived.conf.in |
2 | --- keepalived-2.0.13/keepalived/etc/init/keepalived.conf.in 2018-08-16 06:16:12.000000000 +0200 |
3 | +++ keepalived-2.0.13-confd/keepalived/etc/init/keepalived.conf.in 2019-03-18 16:17:53.861414051 +0100 |
4 | @@ -6,6 +6,6 @@ |
5 | respawn |
6 | |
7 | script |
8 | - . @sysconfdir@/sysconfig/keepalived |
9 | + . @sysconfdir@/conf.d/keepalived |
10 | exec @sbindir@/keepalived --dont-fork ${KEEPALIVED_OPTIONS} |
11 | end script |
12 | diff -Naur keepalived-2.0.13/keepalived/etc/init.d/keepalived keepalived-2.0.13-confd/keepalived/etc/init.d/keepalived |
13 | --- keepalived-2.0.13/keepalived/etc/init.d/keepalived 2018-08-16 06:16:12.000000000 +0200 |
14 | +++ keepalived-2.0.13-confd/keepalived/etc/init.d/keepalived 2019-03-18 16:18:16.754089699 +0100 |
15 | @@ -12,7 +12,7 @@ |
16 | . /etc/rc.d/init.d/functions |
17 | |
18 | # Source configuration file (we set KEEPALIVED_OPTIONS there) |
19 | -. /etc/sysconfig/keepalived |
20 | +. /etc/conf.d/keepalived |
21 | |
22 | RETVAL=0 |
23 | |
24 | diff -Naur keepalived-2.0.13/keepalived/keepalived.service.in keepalived-2.0.13-confd/keepalived/keepalived.service.in |
25 | --- keepalived-2.0.13/keepalived/keepalived.service.in 2018-08-16 06:16:12.000000000 +0200 |
26 | +++ keepalived-2.0.13-confd/keepalived/keepalived.service.in 2019-03-18 16:17:20.092892666 +0100 |
27 | @@ -7,7 +7,7 @@ |
28 | Type=forking |
29 | PIDFile=@PID_DIR@/run/keepalived.pid |
30 | KillMode=process |
31 | -EnvironmentFile=-@sysconfdir@/sysconfig/keepalived |
32 | +EnvironmentFile=-@sysconfdir@/conf.d/keepalived |
33 | ExecStart=@sbindir@/keepalived $KEEPALIVED_OPTIONS |
34 | ExecReload=/bin/kill -HUP $MAINPID |
35 | |
36 | diff -Naur keepalived-2.0.13/keepalived/Makefile.am keepalived-2.0.13-confd/keepalived/Makefile.am |
37 | --- keepalived-2.0.13/keepalived/Makefile.am 2018-08-16 06:16:12.000000000 +0200 |
38 | +++ keepalived-2.0.13-confd/keepalived/Makefile.am 2019-03-18 16:21:15.545559534 +0100 |
39 | @@ -58,8 +58,8 @@ |
40 | |
41 | MAINTAINERCLEANFILES = @MAINTAINERCLEANFILES@ |
42 | |
43 | -sysconfigdir = $(sysconfdir)/sysconfig |
44 | -sysconfig_DATA = etc/sysconfig/keepalived |
45 | +sysconfigdir = $(sysconfdir)/conf.d |
46 | +sysconfig_DATA = etc/conf.d/keepalived |
47 | |
48 | configdir = $(sysconfdir)/@PACKAGE@ |
49 | config_DATA = etc/keepalived/keepalived.conf |
50 | diff -Naur keepalived-2.0.13/keepalived/Makefile.in keepalived-2.0.13-confd/keepalived/Makefile.in |
51 | --- keepalived-2.0.13/keepalived/Makefile.in 2019-02-18 17:18:28.000000000 +0100 |
52 | +++ keepalived-2.0.13-confd/keepalived/Makefile.in 2019-03-18 16:21:37.599247752 +0100 |
53 | @@ -381,8 +381,8 @@ |
54 | EXTRA_DIST = keepalived.service.in |
55 | keepalived_LDADD = core/libcore.a $(IPVS_LIB) $(VRRP_LIB) $(BFD_LIB) core/libcore.a ../lib/liblib.a $(KA_LIBS) |
56 | MOSTLYCLEANFILES = keepalived.service |
57 | -sysconfigdir = $(sysconfdir)/sysconfig |
58 | -sysconfig_DATA = etc/sysconfig/keepalived |
59 | +sysconfigdir = $(sysconfdir)/conf.d |
60 | +sysconfig_DATA = etc/conf.d/keepalived |
61 | configdir = $(sysconfdir)/@PACKAGE@ |
62 | config_DATA = etc/keepalived/keepalived.conf |
63 | @INIT_SYSTEMD_TRUE@systemdsystemunit_DATA = keepalived.service |