Hello community, here is the log from the commit of package ndctl for openSUSE:Factory checked in at 2019-01-15 09:11:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ndctl (Old) and /work/SRC/openSUSE:Factory/.ndctl.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ndctl" Tue Jan 15 09:11:07 2019 rev:19 rq:664029 version:63 Changes: -------- --- /work/SRC/openSUSE:Factory/ndctl/ndctl.changes 2018-12-13 19:50:14.664561432 +0100 +++ /work/SRC/openSUSE:Factory/.ndctl.new.28833/ndctl.changes 2019-01-15 09:11:08.758526247 +0100 @@ -1,0 +2,6 @@ +Tue Jan 8 09:18:04 UTC 2019 - [email protected] + +- Use Type=simple instead of Type=forking for service (bsc#1120931) + + 0001-ndctl-monitor-use-type-simple-instead-of-type-forkin.patch + +------------------------------------------------------------------- New: ---- 0001-ndctl-monitor-use-type-simple-instead-of-type-forkin.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ndctl.spec ++++++ --- /var/tmp/diff_new_pack.xX0j6s/_old 2019-01-15 09:11:09.590525479 +0100 +++ /var/tmp/diff_new_pack.xX0j6s/_new 2019-01-15 09:11:09.594525475 +0100 @@ -29,6 +29,7 @@ Url: https://github.com/pmem/ndctl # Snapshot tarball can be created using: ./make-git-shapshot.sh [gitcommit] Source0: %{name}-%{version}.tar.gz +Patch0: 0001-ndctl-monitor-use-type-simple-instead-of-type-forkin.patch ExclusiveArch: x86_64 ppc64le # required for documentation @@ -86,6 +87,7 @@ %prep %setup +%patch0 -p1 %build echo "%{version}" > version ++++++ 0001-ndctl-monitor-use-type-simple-instead-of-type-forkin.patch ++++++ >From cfdd874353e2798000dc1f9ebd99882c4d373c08 Mon Sep 17 00:00:00 2001 From: Johannes Thumshirn <[email protected]> Date: Mon, 7 Jan 2019 16:45:31 +0100 Subject: [PATCH] ndctl, monitor: use type=simple instead of type=forking Git-commit: 6efb0a555a21f9cb8b7219e30a819731bc28d27b Patch-mainline: v63.1 or v64 References: bsc#1120931 There is no need to use Type=forking for 'ndctl monitor', Type=simple is sufficient. When we use Type=forking and try to run ndctl monitor on a machine without pmem we even get the following error in the journal: Jan 07 13:34:54 bragi systemd[1]: Starting Ndctl Monitor Daemon... Jan 07 13:34:54 bragi ndctl[13776]: custom logging function 0x55ea57d60250 registered Jan 07 13:34:54 bragi systemd[1]: Started Ndctl Monitor Daemon. Jan 07 13:34:54 bragi ndctl[13777]: ndctl monitor daemon started Jan 07 13:34:54 bragi kill[13778]: kill: cannot find process "" Jan 07 13:34:54 bragi systemd[1]: ndctl-monitor.service: Control process exited, code=exited status=1 Jan 07 13:34:54 bragi systemd[1]: ndctl-monitor.service: Unit entered failed state. Jan 07 13:34:54 bragi systemd[1]: ndctl-monitor.service: Failed with result 'exit-code'. This is because the daemon exits and systemd is not able to determine $MAINPID anymore. Signed-off-by: Johannes Thumshirn <[email protected]> --- ndctl/ndctl-monitor.service | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ndctl/ndctl-monitor.service b/ndctl/ndctl-monitor.service index 342a1b1972d5..eeedbd30bb42 100644 --- a/ndctl/ndctl-monitor.service +++ b/ndctl/ndctl-monitor.service @@ -2,9 +2,8 @@ Description=Ndctl Monitor Daemon [Service] -Type=forking -ExecStart=/usr/bin/ndctl monitor --daemon -ExecStop=/bin/kill ${MAINPID} +Type=simple +ExecStart=/usr/bin/ndctl monitor [Install] WantedBy=multi-user.target -- 2.16.4
