Package: pcs / 0.9.155+dfsg-2+deb9u1

0010-Replace-chkconfig.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
Description: Replace chkconfig calls
 All chkconfig calls should be replaced with update-rc.d
 and insserv calls to work on Debian.
Author: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Last-Update: 2016-11-13
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/pcsd/pcs.rb
+++ b/pcsd/pcs.rb
@@ -1968,11 +1968,22 @@
 def is_service_enabled?(service)
   if ISSYSTEMCTL
     cmd = ['systemctl', 'is-enabled', "#{service}.service"]
+    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
+    return (retcode == 0)
   else
-    cmd = ['chkconfig', service]
+    cmd = ['/sbin/insserv', '-s']
+    stdout, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
+    if retcode != 0
+      return nil
+    end
+    stdout.each { |line|
+      parts = line.split(':')
+      if parts[3] == service and parts[0] == 'S'
+        return true
+      end
+    }
+    return false
   end
-  _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
-  return (retcode == 0)
 end
 
 def is_service_running?(service)
@@ -1987,12 +1998,13 @@
 
 def is_service_installed?(service)
   unless ISSYSTEMCTL
-    stdout, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), 'chkconfig')
+    cmd = ['/sbin/insserv', '-s']
+    stdout, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
     if retcode != 0
       return nil
     end
     stdout.each { |line|
-      if line.split(' ')[0] == service
+      if line.split(':')[3] == service
         return true
       end
     }
@@ -2019,7 +2031,7 @@
     cmd = ['systemctl', 'enable', "#{service}.service"]
   else
     # fails when the service is not installed
-    cmd = ['chkconfig', service, 'on']
+    cmd = ['update-rc.d', service, 'enable']
   end
   _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
   return (retcode == 0)
@@ -2034,7 +2046,7 @@
   if ISSYSTEMCTL
     cmd = ['systemctl', 'disable', "#{service}.service"]
   else
-    cmd = ['chkconfig', service, 'off']
+    cmd = ['update-rc.d', service, 'disable']
   end
   _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
   return (retcode == 0)
--- a/pcs/lib/external.py
+++ b/pcs/lib/external.py
@@ -145,7 +145,7 @@
             _systemctl, "disable", _get_service_name(service, instance)
         ])
     else:
-        stdout, stderr, retval = runner.run([_chkconfig, service, "off"])
+        stdout, stderr, retval = runner.run([_chkconfig, service, "disable"])
     if retval != 0:
         raise DisableServiceError(
             service,
@@ -169,7 +169,7 @@
             _systemctl, "enable", _get_service_name(service, instance)
         ])
     else:
-        stdout, stderr, retval = runner.run([_chkconfig, service, "on"])
+        stdout, stderr, retval = runner.run([_chkconfig, service, "enable"])
     if retval != 0:
         raise EnableServiceError(
             service,
@@ -252,10 +252,17 @@
         dummy_stdout, dummy_stderr, retval = runner.run(
             [_systemctl, "is-enabled", _get_service_name(service, instance)]
         )
+        return retval == 0
     else:
-        dummy_stdout, dummy_stderr, retval = runner.run([_chkconfig, service])
-
-    return retval == 0
+        stdout, dummy_stderr, retval = runner.run(["/sbin/insserv", "-s"])
+        if retval != 0:
+            return False
+
+        for line in stdout.splitlines():
+            fields = line.split(":")
+            if fields[3] == service and fields[0] == "S":
+                return True
+        return False
 
 
 def is_service_running(runner, service, instance=None):
@@ -301,13 +308,13 @@
     if is_systemctl():
         return []
 
-    stdout, dummy_stderr, return_code = runner.run([_chkconfig])
+    stdout, dummy_stderr, return_code = runner.run(["/sbin/insserv", "-s"])
     if return_code != 0:
         return []
 
     service_list = []
     for service in stdout.splitlines():
-        service = service.split(" ", 1)[0]
+        service = service.split(":")[3]
         if service:
             service_list.append(service)
     return service_list
--- a/pcs/test/test_lib_external.py
+++ b/pcs/test/test_lib_external.py
@@ -1082,7 +1082,7 @@
         self.mock_runner.run.return_value = ("", "", 0)
         lib.disable_service(self.mock_runner, self.service)
         self.mock_runner.run.assert_called_once_with(
-            [_chkconfig, self.service, "off"]
+            [_chkconfig, self.service, "disable"]
         )
 
     def test_not_systemctl_failed(self, mock_is_installed, mock_systemctl):
@@ -1094,7 +1094,7 @@
             lambda: lib.disable_service(self.mock_runner, self.service)
         )
         self.mock_runner.run.assert_called_once_with(
-            [_chkconfig, self.service, "off"]
+            [_chkconfig, self.service, "disable"]
         )
 
     def test_systemctl_not_installed(
@@ -1130,7 +1130,7 @@
         self.mock_runner.run.return_value = ("", "", 0)
         lib.disable_service(self.mock_runner, self.service, instance="test")
         self.mock_runner.run.assert_called_once_with(
-            [_chkconfig, self.service, "off"]
+            [_chkconfig, self.service, "disable"]
         )
 
 @mock.patch("pcs.lib.external.is_systemctl")
@@ -1163,7 +1163,7 @@
         self.mock_runner.run.return_value = ("", "", 0)
         lib.enable_service(self.mock_runner, self.service)
         self.mock_runner.run.assert_called_once_with(
-            [_chkconfig, self.service, "on"]
+            [_chkconfig, self.service, "enable"]
         )
 
     def test_not_systemctl_failed(self, mock_systemctl):
@@ -1174,7 +1174,7 @@
             lambda: lib.enable_service(self.mock_runner, self.service)
         )
         self.mock_runner.run.assert_called_once_with(
-            [_chkconfig, self.service, "on"]
+            [_chkconfig, self.service, "enable"]
         )
 
     def test_instance_systemctl(self, mock_systemctl):
@@ -1192,7 +1192,7 @@
         self.mock_runner.run.return_value = ("", "", 0)
         lib.enable_service(self.mock_runner, self.service, instance="test")
         self.mock_runner.run.assert_called_once_with(
-            [_chkconfig, self.service, "on"]
+            [_chkconfig, self.service, "enable"]
         )
 
 
@@ -1401,18 +1401,18 @@
 
     def test_not_systemctl_enabled(self, mock_systemctl):
         mock_systemctl.return_value = False
-        self.mock_runner.run.return_value = ("", "", 0)
+        self.mock_runner.run.return_value = ("S:02:2 3 4 5:" + self.service, "", 0)
         self.assertTrue(lib.is_service_enabled(self.mock_runner, self.service))
         self.mock_runner.run.assert_called_once_with(
-            [_chkconfig, self.service]
+            ["/sbin/insserv", "-s"]
         )
 
     def test_not_systemctl_disabled(self, mock_systemctl):
         mock_systemctl.return_value = False
-        self.mock_runner.run.return_value = ("", "", 3)
+        self.mock_runner.run.return_value = ("K:01:0 1 6:" + self.service, "", 0)
         self.assertFalse(lib.is_service_enabled(self.mock_runner, self.service))
         self.mock_runner.run.assert_called_once_with(
-            [_chkconfig, self.service]
+            ["/sbin/insserv", "-s"]
         )
 
 
@@ -1555,23 +1555,23 @@
     def test_success(self, mock_is_systemctl):
         mock_is_systemctl.return_value = False
         self.mock_runner.run.return_value = ("""\
-pcsd           	0:off	1:off	2:on	3:on	4:on	5:on	6:off
-sbd            	0:off	1:on	2:on	3:on	4:on	5:on	6:off
-pacemaker      	0:off	1:off	2:off	3:off	4:off	5:off	6:off
+K:01:0 1 6:pcsd
+S:02:2 3 4 5:sbd
+S:02:2 3 4 5:pacemaker
 """, "", 0)
         self.assertEqual(
             lib.get_non_systemd_services(self.mock_runner),
             ["pcsd", "sbd", "pacemaker"]
         )
         self.assertEqual(mock_is_systemctl.call_count, 1)
-        self.mock_runner.run.assert_called_once_with([_chkconfig])
+        self.mock_runner.run.assert_called_once_with(["/sbin/insserv", "-s"])
 
     def test_failed(self, mock_is_systemctl):
         mock_is_systemctl.return_value = False
         self.mock_runner.run.return_value = ("stdout", "failed", 1)
         self.assertEqual(lib.get_non_systemd_services(self.mock_runner), [])
         self.assertEqual(mock_is_systemctl.call_count, 1)
-        self.mock_runner.run.assert_called_once_with([_chkconfig])
+        self.mock_runner.run.assert_called_once_with(["/sbin/insserv", "-s"])
 
     def test_systemd(self, mock_is_systemctl):
         mock_is_systemctl.return_value = True
--- a/pcs/settings.py.debian
+++ b/pcs/settings.py.debian
@@ -6,3 +6,4 @@
 stonithd_binary = "/usr/lib/pacemaker/stonithd"
 pcsd_exec_location = "/usr/share/pcsd/"
 sbd_config = "/etc/default/sbd"
+chkconfig_binary = "/usr/sbin/update-rc.d"