diff mbox series

[1/1] package/mender: Fix incorrectly named service file

Message ID 20200828170844.412507-1-aduskett@gmail.com
State Accepted
Headers show
Series [1/1] package/mender: Fix incorrectly named service file | expand

Commit Message

Adam Duskett Aug. 28, 2020, 5:08 p.m. UTC 
From: Adam Duskett <Aduskett@gmail.com>

Many of the mender CLI commands use systemctl commands to get information about
the daemon, such as the PID (IE: systemctl show -p MainPID mender-client).
As seen above, these commands expect the service file to be named
"mender-client" instead of "mender."

As such, in the current state, running a forced update check in the CLI will
result in the following error:
failed to force updateCheck: could not find the PID of the mender daemon.

Changing the name of mender.service to mender-client.service fixes the issue.

Signed-off-by: Adam Duskett <Aduskett@gmail.com>
---
 package/mender/{mender.service => mender-client.service} | 0
 package/mender/mender.mk                                 | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename package/mender/{mender.service => mender-client.service} (100%)

Comments

Peter Korsgaard Aug. 28, 2020, 8:36 p.m. UTC | #1 
>>>>> "aduskett" == aduskett  <aduskett@gmail.com> writes:

 > From: Adam Duskett <Aduskett@gmail.com>
 > Many of the mender CLI commands use systemctl commands to get information about
 > the daemon, such as the PID (IE: systemctl show -p MainPID mender-client).
 > As seen above, these commands expect the service file to be named
 > "mender-client" instead of "mender."

 > As such, in the current state, running a forced update check in the CLI will
 > result in the following error:
 > failed to force updateCheck: could not find the PID of the mender daemon.

 > Changing the name of mender.service to mender-client.service fixes the issue.

 > Signed-off-by: Adam Duskett <Aduskett@gmail.com>

Committed, thanks.
diff mbox series

Patch

diff --git a/package/mender/mender.service b/package/mender/mender-client.service
similarity index 100%
rename from package/mender/mender.service
rename to package/mender/mender-client.service
diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index 325141787e..ca24b853b5 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -77,8 +77,8 @@  endef
 MENDER_POST_INSTALL_TARGET_HOOKS += MENDER_INSTALL_CONFIG_FILES
 
 define MENDER_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender.service \
-		$(TARGET_DIR)/usr/lib/systemd/system/mender.service
+	$(INSTALL) -D -m 0644 $(MENDER_PKGDIR)/mender-client.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/mender-client.service
 endef
 
 define MENDER_INSTALL_INIT_SYSV