Use rm -f in the systemd services file.

Thank you to Francois Marier for the patch!

diff --git a/ChangeLog b/ChangeLog
index 7e10c16832eeda2c9e2b348b0b97f9d45d2e9227..47894d9bea52afc131070b2562abbd4c801a9904 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2020-12-06  Andrew Ruthven
+  Minor update to systemd service file.
+
 2019-01-29  Andrew Ruthven
   Release version 1.0.1.
 

diff --git a/debian/changelog b/debian/changelog
index 433208524122d341a4bf0f22050d4dbb3baf17fd..4cfca92eba7c646cc444c38f4581d8f27460ca6e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mythtv-status (1.0.1-2) UNRELEASED; urgency=medium
+
+  * Update systemd services file to use -f with rm (Closes: 954734).
+
+ -- Andrew Ruthven <andrew@etc.gen.nz>  Sun, 06 Dec 2020 22:51:12 +1300
+
 mythtv-status (1.0.1-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/mythtv-status.service b/debian/mythtv-status.service
index 882cf8fe87b9e83cc39ebdb1798c27142214d253..84dcd1988010d0ab61a95ec50fb2ce43ef0c743e 100644 (file)
--- a/debian/mythtv-status.service
+++ b/debian/mythtv-status.service
@@ -7,9 +7,9 @@ Documentation=man:mythtv-status
 [Service]
 Type=oneshot
 RemainAfterExit=true
-ExecStart=/bin/sh -c "rm /var/lib/mythtv-status/motd_update_disabled || true"
+ExecStart=/bin/sh -c "rm -f /var/lib/mythtv-status/motd_update_disabled"
 ExecStart=/usr/sbin/mythtv-update-motd
-ExecStop=/bin/sh -c "touch /var/lib/mythtv-status/motd_update_disabled; rm /run/motd.mythtv-status || true";
+ExecStop=/bin/sh -c "touch /var/lib/mythtv-status/motd_update_disabled; rm -f /run/motd.mythtv-status";
 
 [Install]
 WantedBy=multi-user.target