summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-02-28 19:15:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-02-28 19:45:00 +0000
commit299f45ad51229f20a97d0baded46e5bae4a23635 (patch)
tree4ebd54c23a419d8ab44ad6f26723eee1d5f0a226
parentAdding rediffed patch from ubuntu to honor debconf daily scan in systemd unit. (diff)
downloadmdadm-299f45ad51229f20a97d0baded46e5bae4a23635.tar.xz
mdadm-299f45ad51229f20a97d0baded46e5bae4a23635.zip
Adding rediffed patch from ubuntu to fix empty spaces in timer unit files.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/debian/0011-mdcheck-fix-empty-spaces-in-timer-unit-files.patch34
-rw-r--r--debian/patches/series1
2 files changed, 35 insertions, 0 deletions
diff --git a/debian/patches/debian/0011-mdcheck-fix-empty-spaces-in-timer-unit-files.patch b/debian/patches/debian/0011-mdcheck-fix-empty-spaces-in-timer-unit-files.patch
new file mode 100644
index 0000000..019d993
--- /dev/null
+++ b/debian/patches/debian/0011-mdcheck-fix-empty-spaces-in-timer-unit-files.patch
@@ -0,0 +1,34 @@
+Author: Eric Desrochers <eric.desrochers@canonical.com>
+Description: mdcheck fix empty spaces in timer unit files (LP: #1852747).
+ dh_installsystemd is failling thus FBTFS because of the spaces
+ in the systemd unit timer files directive.
+
+diff -Naurp mdadm.orig/systemd/mdcheck_continue.timer mdadm/systemd/mdcheck_continue.timer
+--- mdadm.orig/systemd/mdcheck_continue.timer
++++ mdadm/systemd/mdcheck_continue.timer
+@@ -14,4 +14,4 @@ RandomizedDelaySec=12h
+ Persistent=true
+
+ [Install]
+-WantedBy= mdmonitor.service
++WantedBy=mdmonitor.service
+diff -Naurp mdadm.orig/systemd/mdcheck_start.timer mdadm/systemd/mdcheck_start.timer
+--- mdadm.orig/systemd/mdcheck_start.timer
++++ mdadm/systemd/mdcheck_start.timer
+@@ -14,5 +14,5 @@ RandomizedDelaySec=24h
+ Persistent=true
+
+ [Install]
+-WantedBy= mdmonitor.service
+-Also= mdcheck_continue.timer
++WantedBy=mdmonitor.service
++Also=mdcheck_continue.timer
+diff -Naurp mdadm.orig/systemd/mdmonitor-oneshot.timer mdadm/systemd/mdmonitor-oneshot.timer
+--- mdadm.orig/systemd/mdmonitor-oneshot.timer
++++ mdadm/systemd/mdmonitor-oneshot.timer
+@@ -14,4 +14,4 @@ RandomizedDelaySec=24h
+ Persistent=true
+
+ [Install]
+-WantedBy= mdmonitor.service
++WantedBy=mdmonitor.service
diff --git a/debian/patches/series b/debian/patches/series
index 93bdb4d..b6e5be4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ debian/0007-no-Werror.patch
debian/0008-test-installed.patch
debian/0009-randomize-timers.patch
debian/0010-systemd-honor-debconf-daily-scan.patch
+debian/0011-mdcheck-fix-empty-spaces-in-timer-unit-files.patch