forked from pool/mdadm
5ab69e45ee
- Update mdadm-4.3 to latest status (jsc#PED-7542)
- Remove hardcoded checkpoint interval checking
0001-Remove-hardcoded-checkpoint-interval-checking.patch
- monitor: refactor checkpoint update
0002-monitor-refactor-checkpoint-update.patch
- Super-intel: Fix first checkpoint restart
0003-Super-intel-Fix-first-checkpoint-restart.patch
- Grow: Move update_tail assign to Grow_reshape()
0004-Grow-Move-update_tail-assign-to-Grow_reshape.patch
- Add understanding output section in man
0005-Add-understanding-output-section-in-man.patch
- Upgrade to mdadm-4.3 (jsc#PED-7542). Beside previous already back
ported patches, mdadm-4.3 has the following extra changes since
last update upto commit 582945c2d3bb,
- Fix null pointer for incremental in mdadm.
- Super1: fix truncation check for journal device.
- Fix some cases eyesore formatting.
- Bump minimum kernel version to 2.6.32.
- Remove the config files in mdcheck_start|continue service.
- Define DEV_MD_DIR, DEV_NUM_PREF, is_devname_ignore(),
ident_set_devname().
- Enable RAID for SATA under VMD.
- Imsm: Fix possible segfault in check_no_platform()
- Imsm refactor on imsm_get_free_size(), merge_extents().
- Imsm: return free space after volume for expand.
- Imsm: fix free space calculations.
- Add secure gethostname() wrapper.
- mdadm: Stop mdcheck_continue timer when mdcheck_start service can
finish check.
OBS-URL: https://build.opensuse.org/request/show/1149803
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=233
62 lines
2.5 KiB
Diff
62 lines
2.5 KiB
Diff
From 6e79d4bd229e5db4e435917daf4c57cd79db9265 Mon Sep 17 00:00:00 2001
|
|
From: colyli <colyli@suse.coly>
|
|
Date: Wed, 17 Oct 2018 11:08:39 +0800
|
|
Subject: [PATCH] Call mdadm_env.sh from /usr/libexec/mdadm
|
|
Patch-mainline: N/A, SUSE only patch
|
|
References: bsc#1111960, bsc#1202090
|
|
|
|
Current Makefile installs mdadm_env.sh to /usr/libexec/mdadm but the
|
|
systemd service files call it from /usr/lib/mdadm. This patch changes
|
|
the calling path in systemd service files to /usr/libexec/mdadm to
|
|
make things working.
|
|
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
---
|
|
Makefile | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Index: mdadm-4.3/systemd/mdcheck_continue.service
|
|
===================================================================
|
|
--- mdadm-4.3.orig/systemd/mdcheck_continue.service
|
|
+++ mdadm-4.3/systemd/mdcheck_continue.service
|
|
@@ -13,4 +13,6 @@ Documentation=man:mdadm(8)
|
|
[Service]
|
|
Type=oneshot
|
|
Environment="MDADM_CHECK_DURATION=6 hours"
|
|
+EnvironmentFile=-/run/sysconfig/mdadm
|
|
+ExecStartPre=-/usr/libexec/mdadm/mdadm_env.sh
|
|
ExecStart=/usr/share/mdadm/mdcheck --continue --duration ${MDADM_CHECK_DURATION}
|
|
Index: mdadm-4.3/systemd/mdcheck_start.service
|
|
===================================================================
|
|
--- mdadm-4.3.orig/systemd/mdcheck_start.service
|
|
+++ mdadm-4.3/systemd/mdcheck_start.service
|
|
@@ -13,4 +13,6 @@ Documentation=man:mdadm(8)
|
|
[Service]
|
|
Type=oneshot
|
|
Environment="MDADM_CHECK_DURATION=6 hours"
|
|
+EnvironmentFile=-/run/sysconfig/mdadm
|
|
+ExecStartPre=-/usr/libexec/mdadm/mdadm_env.sh
|
|
ExecStart=/usr/share/mdadm/mdcheck --duration ${MDADM_CHECK_DURATION}
|
|
Index: mdadm-4.3/systemd/mdmonitor-oneshot.service
|
|
===================================================================
|
|
--- mdadm-4.3.orig/systemd/mdmonitor-oneshot.service
|
|
+++ mdadm-4.3/systemd/mdmonitor-oneshot.service
|
|
@@ -12,5 +12,5 @@ Documentation=man:mdadm(8)
|
|
[Service]
|
|
Environment=MDADM_MONITOR_ARGS=--scan
|
|
EnvironmentFile=-/run/sysconfig/mdadm
|
|
-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh
|
|
+ExecStartPre=-/usr/libexec/mdadm/mdadm_env.sh
|
|
ExecStart=BINDIR/mdadm --monitor --oneshot $MDADM_MONITOR_ARGS
|
|
Index: mdadm-4.3/systemd/mdmonitor.service
|
|
===================================================================
|
|
--- mdadm-4.3.orig/systemd/mdmonitor.service
|
|
+++ mdadm-4.3/systemd/mdmonitor.service
|
|
@@ -13,5 +13,5 @@ Documentation=man:mdadm(8)
|
|
[Service]
|
|
Environment= MDADM_MONITOR_ARGS=--scan
|
|
EnvironmentFile=-/run/sysconfig/mdadm
|
|
-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh
|
|
+ExecStartPre=-/usr/libexec/mdadm/mdadm_env.sh
|
|
ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
|