Adding rediffed patch from ubuntu to honor debconf daily scan in systemd unit.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
dd4f1212f1
commit
2839baeae2
2 changed files with 18 additions and 0 deletions
17
debian/patches/debian/0010-systemd-honor-debconf-daily-scan.patch
vendored
Normal file
17
debian/patches/debian/0010-systemd-honor-debconf-daily-scan.patch
vendored
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
Author: dann frazier <dannf@ubuntu.com>
|
||||||
|
Description: Honor the debconf mdadm/autoscan setting in the systemd timer
|
||||||
|
There was an mdadm/autoscan template added to allow users to disable this
|
||||||
|
feature via debconf. This is exposed as a variable in /etc/default/mdadm,
|
||||||
|
which was processed by a cronjob. Dropping the cronjob and moving to a
|
||||||
|
systemd timer, we need to add our own processing.
|
||||||
|
|
||||||
|
diff -Naurp mdadm.orig/systemd/mdmonitor-oneshot.service mdadm/systemd/mdmonitor-oneshot.service
|
||||||
|
--- mdadm.orig/systemd/mdmonitor-oneshot.service
|
||||||
|
+++ mdadm/systemd/mdmonitor-oneshot.service
|
||||||
|
@@ -10,4 +10,5 @@ Description=Reminder for degraded MD arr
|
||||||
|
Documentation=man:mdadm(8)
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
-ExecStart=BINDIR/mdadm --monitor --oneshot --scan
|
||||||
|
+EnvironmentFile=-/etc/default/mdadm
|
||||||
|
+ExecStart=sh -c '[ "$AUTOSCAN" != "true" ] || BINDIR/mdadm --monitor --oneshot --scan'
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -7,3 +7,4 @@ debian/0006-readlink-path.patch
|
||||||
debian/0007-no-Werror.patch
|
debian/0007-no-Werror.patch
|
||||||
debian/0008-test-installed.patch
|
debian/0008-test-installed.patch
|
||||||
debian/0009-randomize-timers.patch
|
debian/0009-randomize-timers.patch
|
||||||
|
debian/0010-systemd-honor-debconf-daily-scan.patch
|
||||||
|
|
Loading…
Add table
Reference in a new issue