From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Thu, 8 Apr 2021 10:41:57 +0000 (+1200)
Subject: Use rm -f in the systemd services file.
X-Git-Tag: debian-sid-1.0.1-2~8
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c6c0e237e6a77deaeee389799faee324101a677;p=mythtv-status.git

Use rm -f in the systemd services file.
---

diff --git a/debian/changelog b/debian/changelog
index 4332085..1e99a0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mythtv-status (1.0.1-2) UNRELEASED; urgency=medium
+
+  * Update systemd service 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