Annotation of /trunk/keepalived/patches/keepalived-2.0.13-confd-2.patch
Parent Directory | Revision Log
Revision 3325 -
(hide annotations)
(download)
Mon Mar 18 15:37:52 2019 UTC (5 years, 6 months ago) by niro
File size: 2762 byte(s)
Mon Mar 18 15:37:52 2019 UTC (5 years, 6 months ago) by niro
File size: 2762 byte(s)
-fixed patch
1 | niro | 3325 | 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:36:35.025354048 +0100 | ||
39 | @@ -58,7 +58,7 @@ | ||
40 | |||
41 | MAINTAINERCLEANFILES = @MAINTAINERCLEANFILES@ | ||
42 | |||
43 | -sysconfigdir = $(sysconfdir)/sysconfig | ||
44 | +sysconfigdir = $(sysconfdir)/conf.d | ||
45 | sysconfig_DATA = etc/sysconfig/keepalived | ||
46 | |||
47 | configdir = $(sysconfdir)/@PACKAGE@ | ||
48 | diff -Naur keepalived-2.0.13/keepalived/Makefile.in keepalived-2.0.13-confd/keepalived/Makefile.in | ||
49 | --- keepalived-2.0.13/keepalived/Makefile.in 2019-02-18 17:18:28.000000000 +0100 | ||
50 | +++ keepalived-2.0.13-confd/keepalived/Makefile.in 2019-03-18 16:37:00.134988863 +0100 | ||
51 | @@ -381,7 +381,7 @@ | ||
52 | EXTRA_DIST = keepalived.service.in | ||
53 | keepalived_LDADD = core/libcore.a $(IPVS_LIB) $(VRRP_LIB) $(BFD_LIB) core/libcore.a ../lib/liblib.a $(KA_LIBS) | ||
54 | MOSTLYCLEANFILES = keepalived.service | ||
55 | -sysconfigdir = $(sysconfdir)/sysconfig | ||
56 | +sysconfigdir = $(sysconfdir)/conf.d | ||
57 | sysconfig_DATA = etc/sysconfig/keepalived | ||
58 | configdir = $(sysconfdir)/@PACKAGE@ | ||
59 | config_DATA = etc/keepalived/keepalived.conf |