PR#50172: Ticket 50169 - lib389 change hardcoded systemctl path - 389-ds-base

Mark Reynolds • 5 years ago

c57528b

src/lib389/lib389/__init__.py

file modified

+9 -9

		`@@ -1206,9 +1206,9 @@`

		`if self.with_systemd() and not self.containerised:`
		`# Do systemd things here ...`
		`- subprocess.check_call(["/usr/bin/systemctl",`
		`- "start",`
		`- "dirsrv@%s" % self.serverid])`
		`+ subprocess.check_call(["systemctl",`
		`+ "start",`
		`+ "dirsrv@%s" % self.serverid])`
		`else:`
		`# Start the process.`
		`# Wait for it to terminate`
		`@@ -1269,9 +1269,9 @@`

		`if self.with_systemd() and not self.containerised:`
		`# Do systemd things here ...`
		`- subprocess.check_call(["/usr/bin/systemctl",`
		`- "stop",`
		`- "dirsrv@%s" % self.serverid])`
		`+ subprocess.check_call(["systemctl",`
		`+ "stop",`
		`+ "dirsrv@%s" % self.serverid])`
		`else:`
		`# TODO: Make the pid path in the files things`
		`# TODO: use the status call instead!!!!`
		`@@ -1296,9 +1296,9 @@`
		`"""`
		`if self.with_systemd() and not self.containerised:`
		`# Do systemd things here ...`
		`- rc = subprocess.call(["/usr/bin/systemctl",`
		`- "is-active", "--quiet",`
		`- "dirsrv@%s" % self.serverid])`
		`+ rc = subprocess.call(["systemctl",`
		`+ "is-active", "--quiet",`
		`+ "dirsrv@%s" % self.serverid])`
		`if rc == 0:`
		`return True`
		`# This .... probably will mess something up`

src/lib389/lib389/instance/setup.py

file modified

+3 -3

		`@@ -714,9 +714,9 @@`
		`# If we are on the correct platform settings, systemd`
		`if general['systemd'] and not self.containerised:`
		`# Should create the symlink we need, but without starting it.`
		`- subprocess.check_call(["/usr/bin/systemctl",`
		`- "enable",`
		`- "dirsrv@%s" % slapd['instance_name']])`
		`+ subprocess.check_call(["systemctl",`
		`+ "enable",`
		`+ "dirsrv@%s" % slapd['instance_name']])`

		`# Setup tmpfiles_d`
		`tmpfile_d = ds_paths.tmpfiles_d + "/dirsrv-" + slapd['instance_name'] + ".conf"`