Browse code

Chkconfig patch to fix interaction with systemctl

Change-Id: Iee8dd5f16ce41f8e41ec0ed246b2be3f21ac918b
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1612
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
(cherry picked from commit 0bd5fff8a24ceb980bc70fb9e9e02140d416a380)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1613
Reviewed-by: suezzelur <anishs@vmware.com>

suezzelur authored on 2016/11/01 07:15:12
Showing 2 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,22 @@
0
+From 2746ad5df8c4925896ce56065afc7cfb79e87911 Mon Sep 17 00:00:00 2001
1
+From: Lukas Nykryn <lnykryn@redhat.com>
2
+Date: Tue, 22 Sep 2015 15:17:05 +0200
3
+Subject: systemd-sysv-install: don't play ping-pong with systemctl
4
+
5
+---
6
+ chkconfig.c | 2 ++
7
+ 1 file changed, 2 insertions(+)
8
+
9
+diff --git a/chkconfig.c b/chkconfig.c
10
+index 6399ef1..6b54c98 100644
11
+--- a/chkconfig.c
12
+@@ -789,6 +789,8 @@ int main(int argc, const char ** argv) {
13
+                 if (!name || !state)
14
+                         usage(progname);
15
+ 
16
++                noRedirectItem = 1;
17
++
18
+                 /* systemd-sysv-install has target and verb in reverse order */
19
+                 c = name;
20
+                 name = state;
... ...
@@ -1,7 +1,7 @@
1 1
 Summary: A system tool for maintaining the /etc/rc*.d hierarchy
2 2
 Name: chkconfig
3 3
 Version: 1.5
4
-Release: 6%{?dist}
4
+Release: 7%{?dist}
5 5
 License: GPLv2
6 6
 Group: System Environment/Base
7 7
 URL: https://git.fedorahosted.org/git/chkconfig.git
... ...
@@ -10,6 +10,7 @@ Patch0:chkconfig-shortopt.patch
10 10
 Patch1:print-service-on-off.patch
11 11
 Patch2:ignore-priorities.patch
12 12
 Patch3:chkconfig-runlevel.patch
13
+Patch4:chkconfig-systemctl-pingpong-fix.patch
13 14
 %define sha1 chkconfig=19a15a6690788686cc173b0d0626eaae01bec0c1
14 15
 Requires: libselinux
15 16
 Requires: libsepol
... ...
@@ -46,6 +47,7 @@ page), ntsysv configures the current runlevel (5 if you're using X).
46 46
 %patch1 -p1
47 47
 %patch2 -p1
48 48
 %patch3 -p1
49
+%patch4 -p1
49 50
 %build
50 51
 
51 52
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{?_smp_mflags}
... ...
@@ -93,6 +95,8 @@ rm -rf %{buildroot}
93 93
 %{_mandir}/*/ntsysv.8*
94 94
 
95 95
 %changelog
96
+* Mon Oct 31 2016 Anish Swaminathan <anishs@vmware.com> 1.5-7
97
+- Chkconfig patch to fix interaction with systemd
96 98
 * Tue Sep 13 2016 Anish Swaminathan <anishs@vmware.com> 1.5-6
97 99
 - Chkconfig patch to return runlevel 3 on Photon OS
98 100
 * Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5-5