1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
From e3615ecb5b6ad8eb408296878aad5628e0e27166 Mon Sep 17 00:00:00 2001
|
|
From: Coly Li <colyli@suse.de>
|
|
Date: Tue, 12 Feb 2019 12:53:18 +0800
|
|
Subject: [PATCH] Detail.c: do not skip first character when calling xstrdup in
|
|
Detail()
|
|
Git-commit: e3615ecb5b6ad8eb408296878aad5628e0e27166
|
|
Patch-mainline: mdadm-4.1+
|
|
References: bsc#1123814
|
|
|
|
'Commit b9c9bd9bacaa ("Detail: ensure --export names are acceptable as
|
|
shell variables")' duplicates mdi->sys_name to sysdev string by,
|
|
char *sysdev = xstrdup(mdi->sys_name + 1);
|
|
which skips the first character of mdi->sys_name. Then when running
|
|
mdadm --detail <md device> --export, the output looks like,
|
|
MD_DEVICE_ev_sda2_ROLE=1
|
|
MD_DEVICE_ev_sda2_DEV=/dev/sda2
|
|
The first character of md device (between MD_DEVICE and _ROLE/_DEV)
|
|
is dropped. The expected output should be,
|
|
MD_DEVICE_dev_sda2_ROLE=1
|
|
MD_DEVICE_dev_sda2_DEV=/dev/sda2
|
|
|
|
This patch removes the '+ 1' from calling xstrdup() in Detail(), which
|
|
gets the dropped first character back.
|
|
|
|
Reported-by: Arvin Schnell <aschnell@suse.com>
|
|
Fixes: b9c9bd9bacaa ("Detail: ensure --export names are acceptable as 4 shell variables")
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
Cc: NeilBrown <neilb@suse.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
Detail.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Detail.c b/Detail.c
|
|
index b3e857a..20ea03a 100644
|
|
--- a/Detail.c
|
|
+++ b/Detail.c
|
|
@@ -284,7 +284,7 @@ int Detail(char *dev, struct context *c)
|
|
struct mdinfo *mdi;
|
|
for (mdi = sra->devs; mdi; mdi = mdi->next) {
|
|
char *path;
|
|
- char *sysdev = xstrdup(mdi->sys_name + 1);
|
|
+ char *sysdev = xstrdup(mdi->sys_name);
|
|
char *cp;
|
|
|
|
path = map_dev(mdi->disk.major,
|
|
--
|
|
2.25.0
|
|
|