summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-02-25 16:21:04 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-02-25 16:27:34 +0000
commit2477dca2043197023caeeefb4682974c5ec74d63 (patch)
treed110bcf4a681d20d4820fd1094e3d6a3e72645f8
parentMerging upstream version 4.2+20230223. (diff)
downloadmdadm-2477dca2043197023caeeefb4682974c5ec74d63.tar.xz
mdadm-2477dca2043197023caeeefb4682974c5ec74d63.zip
Removing documentation-keys-in-service-files.patch, included upstream.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/patches/documentation-keys-in-service-files.patch77
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 78 deletions
diff --git a/debian/patches/documentation-keys-in-service-files.patch b/debian/patches/documentation-keys-in-service-files.patch
deleted file mode 100644
index a100208..0000000
--- a/debian/patches/documentation-keys-in-service-files.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Description: Make adjustments to systemd files provided by upstream
-Author: Felix Lechner <felix.lechner@lease-up.com>
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/systemd/mdcheck_continue.service
-+++ b/systemd/mdcheck_continue.service
-@@ -7,7 +7,8 @@
-
- [Unit]
- Description=MD array scrubbing - continuation
--ConditionPathExistsGlob = /var/lib/mdcheck/MD_UUID_*
-+ConditionPathExistsGlob=/var/lib/mdcheck/MD_UUID_*
-+Documentation=man:mdadm(8)
-
- [Service]
- Type=oneshot
---- a/systemd/mdcheck_start.service
-+++ b/systemd/mdcheck_start.service
-@@ -8,6 +8,7 @@
- [Unit]
- Description=MD array scrubbing
- Wants=mdcheck_continue.timer
-+Documentation=man:mdadm(8)
-
- [Service]
- Type=oneshot
---- a/systemd/mdmonitor-oneshot.service
-+++ b/systemd/mdmonitor-oneshot.service
-@@ -7,6 +7,7 @@
-
- [Unit]
- Description=Reminder for degraded MD arrays
-+Documentation=man:mdadm(8)
-
- [Service]
- Environment=MDADM_MONITOR_ARGS=--scan
---- a/systemd/mdadm-grow-continue@.service
-+++ b/systemd/mdadm-grow-continue@.service
-@@ -8,6 +8,7 @@
- [Unit]
- Description=Manage MD Reshape on /dev/%I
- DefaultDependencies=no
-+Documentation=man:mdadm(8)
-
- [Service]
- ExecStart=BINDIR/mdadm --grow --continue /dev/%I
---- a/systemd/mdadm-last-resort@.service
-+++ b/systemd/mdadm-last-resort@.service
-@@ -2,6 +2,7 @@
- Description=Activate md array %I even though degraded
- DefaultDependencies=no
- ConditionPathExists=!/sys/devices/virtual/block/%i/md/sync_action
-+Documentation=man:mdadm(8)
-
- [Service]
- Type=oneshot
---- a/systemd/mdmon@.service
-+++ b/systemd/mdmon@.service
-@@ -9,6 +9,7 @@
- Description=MD Metadata Monitor on /dev/%I
- DefaultDependencies=no
- Before=initrd-switch-root.target
-+Documentation=man:mdmon(8)
-
- [Service]
- # mdmon should never complain due to lack of a platform,
---- a/systemd/mdmonitor.service
-+++ b/systemd/mdmonitor.service
-@@ -8,6 +8,7 @@
- [Unit]
- Description=MD array monitor
- DefaultDependencies=no
-+Documentation=man:mdadm(8)
-
- [Service]
- Environment= MDADM_MONITOR_ARGS=--scan
diff --git a/debian/patches/series b/debian/patches/series
index e6f1bf6..2d6268c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
fix-manpages.patch
fix-command-line-help.patch
-documentation-keys-in-service-files.patch
mdmonitor-service-simplify.diff
host-name-in-default-mailfrom.patch
exit-gracefully-when-md-device-not-found.patch