diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-05-15 12:16:10 +0100 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2018-05-15 12:16:10 +0100 |
commit | a8860e1d7bee9524596cf3c5186219cf18d78ffe (patch) | |
tree | 216a0198b6d55be95ea81ca9ea6c8a7e3dfb11ea | |
parent | f0819c18672a939ad2a6c00c6fa37f73be7a54f3 (diff) |
Refresh patches
-rw-r--r-- | debian/patches/debian-conffile-location.diff | 11 | ||||
-rw-r--r-- | debian/patches/mdmonitor-service-simplify.diff | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/debian/patches/debian-conffile-location.diff b/debian/patches/debian-conffile-location.diff index 40a1e87a..8adf7b7e 100644 --- a/debian/patches/debian-conffile-location.diff +++ b/debian/patches/debian-conffile-location.diff @@ -102,14 +102,3 @@ Reviewed-by: martin f. krafft <madduck@debian.org> .SH DESCRIPTION .PP .I mdadm ---- a/mdassemble.8 -+++ b/mdassemble.8 -@@ -40,7 +40,7 @@ - - .SH FILES - --.SS /etc/mdadm.conf -+.SS /etc/mdadm/mdadm.conf - - The config file lists which devices may be scanned to see if - they contain MD super block, and gives identifying information diff --git a/debian/patches/mdmonitor-service-simplify.diff b/debian/patches/mdmonitor-service-simplify.diff index ea706a68..30d81e1e 100644 --- a/debian/patches/mdmonitor-service-simplify.diff +++ b/debian/patches/mdmonitor-service-simplify.diff @@ -9,12 +9,12 @@ 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 +@@ -10,7 +10,4 @@ DefaultDependencies=no [Service] -Environment= MDADM_MONITOR_ARGS=--scan -EnvironmentFile=-/run/sysconfig/mdadm --ExecStartPre=-/usr/lib/systemd/scripts/mdadm_env.sh +-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh -ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS +ExecStart=BINDIR/mdadm --monitor --scan |