summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2014-11-14 19:18:39 +0300
committerMichael Tokarev <mjt@tls.msk.ru>2014-11-14 19:18:39 +0300
commit8c4892dfabb685d7e9f6d362fa4251b8f6a290d2 (patch)
tree25356e647d1420c93e88a7bb7bde25ca884d495a /debian
parentaa6d353cb5f4ebce1fc4d98fd19a8a7fccac18c6 (diff)
mdmonitor-service-simplify.diff: simplify mdmonitor.service (764647)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/mdmonitor-service-simplify.diff20
-rw-r--r--debian/patches/series1
3 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8bd8233f..265f7960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ mdadm (3.3.2-3) UNRELEASED; urgency=low
as when doing inital assembly
* readlink-path.patch: readlink is in /bin not /usr/bin on debian
(Closes: #766416)
+ * mdmonitor-service-simplify.diff: simplify mdmonitor.service
+ systemd file, do not try to read non-existing files (Closes: #764647)
-- Michael Tokarev <mjt@tls.msk.ru> Mon, 06 Oct 2014 11:28:42 +0400
diff --git a/debian/patches/mdmonitor-service-simplify.diff b/debian/patches/mdmonitor-service-simplify.diff
new file mode 100644
index 00000000..ea706a68
--- /dev/null
+++ b/debian/patches/mdmonitor-service-simplify.diff
@@ -0,0 +1,20 @@
+Subject: simplify mdmonitor.service
+From: Michael Tokarev <mjt@tls.msk.ru>
+Date: Fri, 14 Nov 2014 19:18:05 +0300
+Bug-Debian: http://bugs.debian.org/764647
+Forwarded: no
+
+There isn't much for customization for mdadm --monitor.
+it'll just do what it's supposed to do, so just run it.
+
+--- a/systemd/mdmonitor.service
++++ b/systemd/mdmonitor.service
+@@ -10,7 +10,4 @@ Description=MD array monitor
+ DefaultDependencies=no
+
+ [Service]
+-Environment= MDADM_MONITOR_ARGS=--scan
+-EnvironmentFile=-/run/sysconfig/mdadm
+-ExecStartPre=-/usr/lib/systemd/scripts/mdadm_env.sh
+-ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
++ExecStart=BINDIR/mdadm --monitor --scan
diff --git a/debian/patches/series b/debian/patches/series
index 5b7bda85..1bd27f93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ use-external-blkid.diff
build-sys-no-check_rundir.patch
rebuildmap-strip-local-host-name-from-device-name.patch
readlink-path.patch
+mdmonitor-service-simplify.diff