850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from
SLE12-SP3 to SLE15, re-order all patches.
- Rename the following patches, they are deleted and re-add in next
part of patches
0001-Generic-support-for-consistency-policy-and-PPL.patch
0002-Detail-show-consistency-policy.patch
0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
0003-imsm-PPL-support.patch
0004-super1-PPL-support.patch
0005-Add-ppl-and-no-ppl-options-for-update.patch
0006-Grow-support-consistency-policy-change.patch
0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch
0008-Retry-HOT_REMOVE_DISK-a-few-times.patch
0009-Introduce-sys_hot_remove_disk.patch
0010-Add-force-flag-to-hot_remove_disk.patch
0011-Detail-handle-non-existent-arrays-better.patch
- Synchronize patches from mdadm of SLE12-SP3, the above renamed
patches are re-add here,
0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch
0002-imsm-fix-missing-error-message-during-migration.patch
0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch
0004-mdadm-check-the-nodes-when-operate-clustered-array.patch
0005-examine-tidy-up-some-code.patch
0006-mdadm-add-man-page-for-symlinks.patch
0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch
0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
0009-mdadm-Specify-enough-length-when-write-to-buffer.patch
0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch
0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch
0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
OBS-URL: https://build.opensuse.org/request/show/517978
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
70 lines
1.9 KiB
Diff
70 lines
1.9 KiB
Diff
From b9c9bd9bacaab701d5b3cb3e4b6cb02ea8d36e47 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.com>
|
|
Date: Thu, 20 Apr 2017 12:40:06 +1000
|
|
Subject: [PATCH] Detail: ensure --export names are acceptable as shell
|
|
variables.
|
|
|
|
If an array contains a device which has a name that
|
|
contains something other than alphnumerics and underscores,
|
|
then some values reported by "mdadm --detail --export" will
|
|
not be valid as variable assignment of the shell.
|
|
This particularly affects dm devices.
|
|
e.g.
|
|
MD_DEVICE_dm-4_ROLE=1
|
|
MD_DEVICE_dm-4_DEV=/dev/dm-4
|
|
|
|
As it is particularly useful to be able to work with these
|
|
in a shell script, and as the precise name is not important,
|
|
change all non-alphanumerics to '_'.
|
|
|
|
MD_DEVICE_dm_4_ROLE=1
|
|
MD_DEVICE_dm_4_DEV=/dev/dm-4
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
---
|
|
Detail.c | 12 +++++++++---
|
|
1 file changed, 9 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Detail.c b/Detail.c
|
|
index e40cd8f..91c5a98 100644
|
|
--- a/Detail.c
|
|
+++ b/Detail.c
|
|
@@ -25,6 +25,7 @@
|
|
#include "mdadm.h"
|
|
#include "md_p.h"
|
|
#include "md_u.h"
|
|
+#include <ctype.h>
|
|
#include <dirent.h>
|
|
|
|
static int cmpstringp(const void *p1, const void *p2)
|
|
@@ -276,17 +277,22 @@ int Detail(char *dev, struct context *c)
|
|
char *path =
|
|
map_dev(mdi->disk.major,
|
|
mdi->disk.minor, 0);
|
|
+ char *sysdev = xstrdup(mdi->sys_name + 1);
|
|
+ char *cp;
|
|
+ for (cp = sysdev; *cp; cp++)
|
|
+ if (!isalnum(*cp))
|
|
+ *cp = '_';
|
|
|
|
if (mdi->disk.raid_disk >= 0)
|
|
printf("MD_DEVICE_%s_ROLE=%d\n",
|
|
- mdi->sys_name+4,
|
|
+ sysdev,
|
|
mdi->disk.raid_disk);
|
|
else
|
|
printf("MD_DEVICE_%s_ROLE=spare\n",
|
|
- mdi->sys_name+4);
|
|
+ sysdev);
|
|
if (path)
|
|
printf("MD_DEVICE_%s_DEV=%s\n",
|
|
- mdi->sys_name+4, path);
|
|
+ sysdev, path);
|
|
}
|
|
}
|
|
goto out;
|
|
--
|
|
2.10.2
|
|
|