diff options
| -rw-r--r-- | debian/patches/debian/0002-mdmonitor-service-simplify.patch | 17 | ||||
| -rw-r--r-- | debian/patches/mdmonitor-service-simplify.diff | 20 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 18 insertions, 21 deletions
diff --git a/debian/patches/debian/0002-mdmonitor-service-simplify.patch b/debian/patches/debian/0002-mdmonitor-service-simplify.patch new file mode 100644 index 0000000..a8163d9 --- /dev/null +++ b/debian/patches/debian/0002-mdmonitor-service-simplify.patch @@ -0,0 +1,17 @@ +Author: Michael Tokarev <mjt@tls.msk.ru> +Description: Simplify mdmonitor.service (Closes: #764647). + There isn't much for customization for mdadm --monitor. + it'll just do what it's supposed to do, so just run it. + +diff -Naurp mdadm.orig/systemd/mdmonitor.service mdadm/systemd/mdmonitor.service +--- mdadm.orig/systemd/mdmonitor.service ++++ mdadm/systemd/mdmonitor.service +@@ -11,7 +11,4 @@ DefaultDependencies=no + Documentation=man:mdadm(8) + + [Service] +-Environment= MDADM_MONITOR_ARGS=--scan +-EnvironmentFile=-/run/sysconfig/mdadm +-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh +-ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS ++ExecStart=BINDIR/mdadm --monitor --scan diff --git a/debian/patches/mdmonitor-service-simplify.diff b/debian/patches/mdmonitor-service-simplify.diff deleted file mode 100644 index 70ddea2..0000000 --- a/debian/patches/mdmonitor-service-simplify.diff +++ /dev/null @@ -1,20 +0,0 @@ -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 -@@ -11,7 +11,4 @@ DefaultDependencies=no - Documentation=man:mdadm(8) - - [Service] --Environment= MDADM_MONITOR_ARGS=--scan --EnvironmentFile=-/run/sysconfig/mdadm --ExecStartPre=-/usr/lib/mdadm/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 634f37d..28e7c57 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ debian/0001-fix-manpages.patch -mdmonitor-service-simplify.diff +debian/0002-mdmonitor-service-simplify.patch host-name-in-default-mailfrom.patch exit-gracefully-when-md-device-not-found.patch sha1-includes.diff |