From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sun, 6 Dec 2020 09:53:24 +0000 (+1300)
Subject: Use rm -f in the systemd services file.
X-Git-Tag: 1.0.2~15
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f18a3b5b363e9c031d480367545bf2464cbcb226;p=mythtv-status.git

Use rm -f in the systemd services file.

Thank you to Francois Marier for the patch!
---

diff --git a/ChangeLog b/ChangeLog
index 7e10c16..47894d9 100644
--- 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 4332085..4cfca92 100644
--- 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 882cf8f..84dcd19 100644
--- 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