Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mdadm for openSUSE:Factory checked
in at 2025-03-03 16:04:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mdadm (Old)
and /work/SRC/openSUSE:Factory/.mdadm.new.19136 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mdadm"
Mon Mar 3 16:04:31 2025 rev:152 rq:1249330 version:4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/mdadm/mdadm.changes 2025-02-07
22:58:25.925422261 +0100
+++ /work/SRC/openSUSE:Factory/.mdadm.new.19136/mdadm.changes 2025-03-03
16:04:41.058133167 +0100
@@ -1,0 +2,53 @@
+Fri Feb 28 22:10:00 UTC 2025 - Martin Wilck <mwi...@suse.com>
+
+- mdopen: add sbin path to env PATH when call system("modprobe md_mod")
+ (bsc#1233265)
+ add 0010-mdopen-add-sbin-path-to-env-PATH-when-call-system-mo.patch
+
+-------------------------------------------------------------------
+Thu Feb 27 21:51:04 UTC 2025 - Martin Wilck <mwi...@suse.com>
+
+- Update to version 4.4 (jsc#PED-10220)
+ Features:
+ * Remove custom bitmap file support from Yu Kuai.
+ * Custom device policies implementation from Mariusz Tkaczyk.
+ * Self encrypted drives (**SED**) support for IMSM metadata from Blazej
Kucman.
+ * Support more than 4 disks for **IMSM** RAID10 from Mateusz Kusiak.
+ * Read **IMSM** license information from ACPI tables from Blazej Kucman.
+ * Support devnode in **--Incremental --remove** from Mariusz Tkaczyk.
+ * Printing **IMSM** license type in **--detail-platform** from Blazej Kucman.
+ * README.md from Mariusz Tkaczyk and Anna Sztukowska.
+ Fixes:
+ * Tests improvements from Xiao Ni and Kinga Stefaniuk.
+ * Mdmon's Checkpointing improvements from Mateusz Kusiak.
+ * Pass mdadm environment flags to systemd-env to enable tests from Mateusz
Kusiak.
+ * Superblock 1.0 uuid printing fixes from Mariusz Tkaczyk.
+ * Find VMD bus manually if link is not available from Mariusz Tkaczyk.
+ * Unconditional devices count printing in --detail from Anna Sztukowska.
+ * Improve SIGTERM handling during reshape, from Mateusz Kusiak.
+ * **Monitor.c** renamed to **Mdmonitor.c** from Kinga Stefaniuk.
+ * Mdmonitor service documentation update from Mariusz Tkaczyk.
+ * Rework around writing to sysfs files from Mariusz Tkaczyk.
+ * Drop of HOT_REMOVE_DISK ioctl in Manage in favour of sysfs from Mariusz
Tkaczyk.
+ * Delegate disk removal to managemon from Mariusz Tkaczyk.
+ * Some clean-ups of legacy code and functionalities like **--auto=md** from
Mariusz Tkaczyk.
+ * Manual clean-up, references to old kernels removed from Mariusz Tkaczyk.
+ * Various static code analysis fixes.
+
+- Add 1000-Revert-mdmonitor-Abandon-custom-configuration-files.patch
+ (reverts upstream change to ignore /etc/sysconfig/mdadm)
+
+- Drop obsolete patches (included upstream):
+ * Del 0001-Remove-hardcoded-checkpoint-interval-checking.patch
+ * Del 0002-monitor-refactor-checkpoint-update.patch
+ * Del 0003-Super-intel-Fix-first-checkpoint-restart.patch
+ * Del 0004-Grow-Move-update_tail-assign-to-Grow_reshape.patch
+ * Del 0005-Add-understanding-output-section-in-man.patch
+ * Del 0006-util.c-change-devnm-to-const-in-mdmon-functions.patch
+ * Del 0007-Wait-for-mdmon-when-it-is-stared-via-systemd.patch
+ * Del 0008-Detail-remove-duplicated-code.patch
+ * Del 0009-mdadm-Fix-native-detail-export.patch
+
+- Use obs_scm for code maintenance
+
+-------------------------------------------------------------------
Old:
----
0001-Remove-hardcoded-checkpoint-interval-checking.patch
0002-monitor-refactor-checkpoint-update.patch
0003-Super-intel-Fix-first-checkpoint-restart.patch
0004-Grow-Move-update_tail-assign-to-Grow_reshape.patch
0005-Add-understanding-output-section-in-man.patch
0006-util.c-change-devnm-to-const-in-mdmon-functions.patch
0007-Wait-for-mdmon-when-it-is-stared-via-systemd.patch
0008-Detail-remove-duplicated-code.patch
0009-mdadm-Fix-native-detail-export.patch
mdadm-4.3.tar.xz
New:
----
0010-mdopen-add-sbin-path-to-env-PATH-when-call-system-mo.patch
1000-Revert-mdmonitor-Abandon-custom-configuration-files.patch
_service
mdadm-4.4.obscpio
mdadm.obsinfo
BETA DEBUG BEGIN:
Old:- Drop obsolete patches (included upstream):
* Del 0001-Remove-hardcoded-checkpoint-interval-checking.patch
* Del 0002-monitor-refactor-checkpoint-update.patch
Old: * Del 0001-Remove-hardcoded-checkpoint-interval-checking.patch
* Del 0002-monitor-refactor-checkpoint-update.patch
* Del 0003-Super-intel-Fix-first-checkpoint-restart.patch
Old: * Del 0002-monitor-refactor-checkpoint-update.patch
* Del 0003-Super-intel-Fix-first-checkpoint-restart.patch
* Del 0004-Grow-Move-update_tail-assign-to-Grow_reshape.patch
Old: * Del 0003-Super-intel-Fix-first-checkpoint-restart.patch
* Del 0004-Grow-Move-update_tail-assign-to-Grow_reshape.patch
* Del 0005-Add-understanding-output-section-in-man.patch
Old: * Del 0004-Grow-Move-update_tail-assign-to-Grow_reshape.patch
* Del 0005-Add-understanding-output-section-in-man.patch
* Del 0006-util.c-change-devnm-to-const-in-mdmon-functions.patch
Old: * Del 0005-Add-understanding-output-section-in-man.patch
* Del 0006-util.c-change-devnm-to-const-in-mdmon-functions.patch
* Del 0007-Wait-for-mdmon-when-it-is-stared-via-systemd.patch
Old: * Del 0006-util.c-change-devnm-to-const-in-mdmon-functions.patch
* Del 0007-Wait-for-mdmon-when-it-is-stared-via-systemd.patch
* Del 0008-Detail-remove-duplicated-code.patch
Old: * Del 0007-Wait-for-mdmon-when-it-is-stared-via-systemd.patch
* Del 0008-Detail-remove-duplicated-code.patch
* Del 0009-mdadm-Fix-native-detail-export.patch
Old: * Del 0008-Detail-remove-duplicated-code.patch
* Del 0009-mdadm-Fix-native-detail-export.patch
BETA DEBUG END:
BETA DEBUG BEGIN:
New: (bsc#1233265)
add 0010-mdopen-add-sbin-path-to-env-PATH-when-call-system-mo.patch
New:
- Add 1000-Revert-mdmonitor-Abandon-custom-configuration-files.patch
(reverts upstream change to ignore /etc/sysconfig/mdadm)
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mdadm.spec ++++++
--- /var/tmp/diff_new_pack.DzSaEE/_old 2025-03-03 16:04:42.138178350 +0100
+++ /var/tmp/diff_new_pack.DzSaEE/_new 2025-03-03 16:04:42.138178350 +0100
@@ -22,7 +22,7 @@
%endif
Name: mdadm
-Version: 4.3
+Version: 4.4
Release: 0
BuildRequires: binutils-devel
BuildRequires: groff
@@ -38,18 +38,11 @@
License: GPL-2.0-only
Group: System/Base
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source:
https://www.kernel.org/pub/linux/utils/raid/mdadm/%{name}-%{version}.tar.xz
+Source: %{name}-%{version}.tar
Source1: Software-RAID.HOWTO.tar.bz2
Source2: sysconfig.mdadm
-Patch1: 0001-Remove-hardcoded-checkpoint-interval-checking.patch
-Patch2: 0002-monitor-refactor-checkpoint-update.patch
-Patch3: 0003-Super-intel-Fix-first-checkpoint-restart.patch
-Patch4: 0004-Grow-Move-update_tail-assign-to-Grow_reshape.patch
-Patch5: 0005-Add-understanding-output-section-in-man.patch
-Patch6: 0006-util.c-change-devnm-to-const-in-mdmon-functions.patch
-Patch7: 0007-Wait-for-mdmon-when-it-is-stared-via-systemd.patch
-Patch8: 0008-Detail-remove-duplicated-code.patch
-Patch9: 0009-mdadm-Fix-native-detail-export.patch
+Patch0010: 0010-mdopen-add-sbin-path-to-env-PATH-when-call-system-mo.patch
+Patch1000: 1000-Revert-mdmonitor-Abandon-custom-configuration-files.patch
Patch1001: 1001-display-timeout-status.patch
Patch1002: 1002-OnCalendar-format-fix-of-mdcheck_start-timer.patch
Patch1003: 1003-mdadm-treat-the-Dell-softraid-array-as-local-array.patch
@@ -111,7 +104,8 @@
%files
%defattr(-,root,root)
%license COPYING
-%doc ChangeLog README.initramfs TODO mdadm.conf-example mkinitramfs
+%doc CHANGELOG.md documentation/mdadm.conf-example
+%doc documentation/external-reshape-design.txt documentation/mdmon-design.txt
%doc Software-RAID.HOWTO/Software-RAID.HOWTO*{.txt,.html}
%doc %{_mandir}/man?/*
%{_sbindir}/*
++++++ 0010-mdopen-add-sbin-path-to-env-PATH-when-call-system-mo.patch ++++++
>From b5f5415636cebafc1a10cc5ee1887adba8fce74d Mon Sep 17 00:00:00 2001
From: Coly Li <col...@suse.de>
Date: Wed, 22 Jan 2025 23:18:59 +0800
Subject: [PATCH] mdopen: add sbin path to env PATH when call system("modprobe
md_mod")
During the boot process if mdadm is called in udev context, sbin paths
like /sbin, /usr/sbin, /usr/local/sbin normally not defined in PATH env
variable, calling system("modprobe md_mod") in create_named_array() may
fail with 'sh: modprobe: command not found' error message.
We don't want to move modprobe binary into udev private directory, so
setting the PATH env is a more proper method to avoid the above issue.
This patch sets PATH env variable with "/sbin:/usr/sbin:/usr/local/sbin"
before calling system("modprobe md_mod"). The change only takes effect
within the udev worker context, not seen by global udev environment.
Signed-off-by: Coly Li <col...@suse.de>
Signed-off-by: Mariusz Tkaczyk <mtkac...@kernel.org>
---
mdopen.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/mdopen.c b/mdopen.c
index 26f0c71..57252b6 100644
--- a/mdopen.c
+++ b/mdopen.c
@@ -39,6 +39,24 @@ int create_named_array(char *devnm)
fd = open(new_array_file, O_WRONLY);
if (fd < 0 && errno == ENOENT) {
+ char buf[PATH_MAX] = {0};
+ char *env_ptr;
+
+ env_ptr = getenv("PATH");
+ /*
+ * When called by udev worker context, path of modprobe
+ * might not be in env PATH. Set sbin paths into PATH
+ * env to avoid potential failure when run modprobe here.
+ */
+ if (env_ptr)
+ snprintf(buf, PATH_MAX - 1, "%s:%s", env_ptr,
+ "/sbin:/usr/sbin:/usr/local/sbin");
+ else
+ snprintf(buf, PATH_MAX - 1, "%s",
+ "/sbin:/usr/sbin:/usr/local/sbin");
+
+ setenv("PATH", buf, 1);
+
if (system("modprobe md_mod") == 0)
fd = open(new_array_file, O_WRONLY);
}
--
2.48.1
++++++ 1000-Revert-mdmonitor-Abandon-custom-configuration-files.patch ++++++
>From 58a2ce726968dcc60aa4d8c380e4f093afd33c58 Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwi...@suse.com>
Date: Thu, 27 Feb 2025 23:17:42 +0100
Subject: [PATCH] Revert "mdmonitor: Abandon custom configuration files"
This reverts commit a7a5e676a7eb2ac97acd31b13f75515e9573f891.
For the time being, we want to stick with /etc/sysconfig/mdadm
---
Makefile | 1 +
systemd/SUSE-mdadm_env.sh | 48 +++++++++++++++++++++++++++++++++++++++
systemd/mdmonitor.service | 22 ++++--------------
3 files changed, 53 insertions(+), 18 deletions(-)
create mode 100644 systemd/SUSE-mdadm_env.sh
diff --git a/Makefile b/Makefile
index bcd092d..24367b0 100644
--- a/Makefile
+++ b/Makefile
@@ -341,6 +341,7 @@ install-systemd: systemd/mdmon@.service
$(INSTALL) -D -m 755 .install.tmp.3
$(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \
rm -f .install.tmp.3; \
done
+ if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755
systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh ;fi
install-bin: mdadm mdmon
$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
diff --git a/systemd/SUSE-mdadm_env.sh b/systemd/SUSE-mdadm_env.sh
new file mode 100644
index 0000000..c13b48a
--- /dev/null
+++ b/systemd/SUSE-mdadm_env.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# extract configuration from /etc/sysconfig/mdadm and write
+# environment to /run/sysconfig/mdadm to be used by
+# systemd unit files.
+
+MDADM_SCAN="yes"
+
+# Following adapted from /etc/init.d/mdadmd on openSUSE
+
+mdadmd_CONFIG=/etc/sysconfig/mdadm
+if test -r $mdadmd_CONFIG; then
+ . $mdadmd_CONFIG
+fi
+
+if [ x$MDADM_DELAY != x"" ]; then
+ MDADM_DELAY="-d "$MDADM_DELAY;
+fi
+
+if [ x$MDADM_MAIL != x"" ]; then
+ MDADM_MAIL="-m \"$MDADM_MAIL\""
+fi
+
+if [ x$MDADM_PROGRAM != x"" ]; then
+ MDADM_PROGRAM="-p \"$MDADM_PROGRAM\""
+fi
+
+if [ x$MDADM_SCAN = x"yes" ]; then
+ MDADM_SCAN="--scan"
+else
+ MDADM_SCAN=""
+fi
+
+if [ x$MDADM_SEND_MAIL_ON_START = x"yes" ]; then
+ MDADM_SEND_MAIL="-t"
+else
+ MDADM_SEND_MAIL=""
+fi
+
+if [ x$MDADM_CONFIG != x"" ]; then
+ MDADM_CONFIG="-c \"$MDADM_CONFIG\""
+fi
+
+mkdir -p /run/sysconfig
+echo "MDADM_MONITOR_ARGS=$MDADM_RAIDDEVICES $MDADM_DELAY $MDADM_MAIL
$MDADM_PROGRAM $MDADM_SCAN $MDADM_SEND_MAIL $MDADM_CONFIG" >
/run/sysconfig/mdadm
+if [ -n "$MDADM_CHECK_DURATION" ]; then
+ echo "MDADM_CHECK_DURATION=$MDADM_CHECK_DURATION" >> /run/sysconfig/mdadm
+fi
diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service
index 95046bc..9c36478 100644
--- a/systemd/mdmonitor.service
+++ b/systemd/mdmonitor.service
@@ -11,21 +11,7 @@ DefaultDependencies=no
Documentation=man:mdadm(8)
[Service]
-# For Maintainers:
-# We need to ensure that the mdmonitor configuration aligns with the
guidelines provided
-# in the man page for users.
-# /etc/sysconfig/mdadm, /etc/sysconfig/mdmonitor, or any other similar
configuration file should
-# not be supported because non upstream components are not described in man
pages.
-
-# Parameters designed to be customized by user, should be settable via
mdadm.conf:
-# - MONITORDELAY (do not set --delay in service)
-# - MAILADDR (do not set --mail in service)
-# - MAILFROM (not settable from cmdline)
-# - PROGRAM (do not set --program or --alert in service)
-#
-# Following parameters can be customized in service:
-# - --syslog (configure syslog logging)
-# - --fork (Type=forking must be added, not recommended and not needed with
systemd)
-# - --pid-file (allowed only when --fork selected)
-
-ExecStart=BINDIR/mdadm --monitor --scan
+Environment= MDADM_MONITOR_ARGS=--scan
+EnvironmentFile=-/run/sysconfig/mdadm
+ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh
+ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
--
2.48.1
++++++ 1001-display-timeout-status.patch ++++++
--- /var/tmp/diff_new_pack.DzSaEE/_old 2025-03-03 16:04:42.178180024 +0100
+++ /var/tmp/diff_new_pack.DzSaEE/_new 2025-03-03 16:04:42.182180191 +0100
@@ -1,13 +1,18 @@
+From 37339bd211623574efd2f6f5e5133a3247e3bbde Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwi...@suse.com>
+Date: Thu, 27 Feb 2025 23:24:16 +0100
+Subject: [PATCH 1001/1005] mdadm -D: display timeout status
+
---
- Detail.c | 1 +
- md_p.h | 1 +
- 2 files changed, 2 insertions(+)
+ Detail.c | 2 ++
+ md_p.h | 1 +
+ 2 files changed, 3 insertions(+)
-Index: mdadm-4.0/Detail.c
-===================================================================
---- mdadm-4.0.orig/Detail.c
-+++ mdadm-4.0/Detail.c
-@@ -693,6 +693,8 @@ This is pretty boring
+diff --git a/Detail.c b/Detail.c
+index 5819ced..1e2e4c0 100644
+--- a/Detail.c
++++ b/Detail.c
+@@ -745,6 +745,8 @@ int Detail(char *dev, struct context *c)
disk.raid_disk >= 0)
failed++;
}
@@ -16,10 +21,10 @@
if (disk.state & (1 << MD_DISK_ACTIVE))
printf(" active");
if (disk.state & (1 << MD_DISK_SYNC)) {
-Index: mdadm-4.0/md_p.h
-===================================================================
---- mdadm-4.0.orig/md_p.h
-+++ mdadm-4.0/md_p.h
+diff --git a/md_p.h b/md_p.h
+index 358a28c..9c66dc6 100644
+--- a/md_p.h
++++ b/md_p.h
@@ -90,6 +90,7 @@
* dire need
*/
@@ -28,4 +33,7 @@
#define MD_DISK_REPLACEMENT 17
#define MD_DISK_JOURNAL 18 /* disk is used as the write journal
in RAID-5/6 */
+--
+2.48.1
+
++++++ 1002-OnCalendar-format-fix-of-mdcheck_start-timer.patch ++++++
--- /var/tmp/diff_new_pack.DzSaEE/_old 2025-03-03 16:04:42.190180526 +0100
+++ /var/tmp/diff_new_pack.DzSaEE/_new 2025-03-03 16:04:42.194180693 +0100
@@ -1,7 +1,7 @@
+From e9d2cca0f83075a946fef81012cf60bb73fee73b Mon Sep 17 00:00:00 2001
From: Ali Abdallah <ali.abdal...@suse.com>
-Subject: OnCalendar format fix of mdcheck_start.timer
-Patch-mainline: in-house patch at this moment, will post to upstream in future
-References: bsc#1173137
+Date: Thu, 27 Feb 2025 23:24:25 +0100
+Subject: [PATCH 1002/1005] OnCalendar format fix of mdcheck_start.timer
This patch includes the fix of the OnCalendar format, changing the format of
mdcheck_start.timer [Timer] section,
@@ -10,10 +10,14 @@
Signed-off-by: Ali Abdallah <ali.abdal...@suse.com>
Acked-by: Coly Li <col...@suse.de>
-Index: mdadm-4.1/systemd/mdcheck_start.timer
-===================================================================
---- mdadm-4.1.orig/systemd/mdcheck_start.timer
-+++ mdadm-4.1/systemd/mdcheck_start.timer
+---
+ systemd/mdcheck_start.timer | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/mdcheck_start.timer b/systemd/mdcheck_start.timer
+index 9e7e02a..ba15ef5 100644
+--- a/systemd/mdcheck_start.timer
++++ b/systemd/mdcheck_start.timer
@@ -9,7 +9,7 @@
Description=MD array scrubbing
@@ -23,4 +27,7 @@
[Install]
WantedBy= mdmonitor.service
+--
+2.48.1
+
++++++ 1003-mdadm-treat-the-Dell-softraid-array-as-local-array.patch ++++++
--- /var/tmp/diff_new_pack.DzSaEE/_old 2025-03-03 16:04:42.206181195 +0100
+++ /var/tmp/diff_new_pack.DzSaEE/_new 2025-03-03 16:04:42.206181195 +0100
@@ -1,9 +1,7 @@
-From 2361620a9d78a4e26ec438b5cc21fe796d411497 Mon Sep 17 00:00:00 2001
+From 1b1936b64511186ef0ea78b8b147825302f8ef56 Mon Sep 17 00:00:00 2001
From: Coly Li <col...@suse.de>
Date: Mon, 31 Aug 2020 00:02:10 +0800
-Subject: [PATCH] mdadm: treat the Dell softraid array as local array
-Patch-mainline: N/A, in-house usage only as a workaround to Dell's softraid bug
-References: bsc#1175004
+Subject: [PATCH 1003/1005] mdadm: treat the Dell softraid array as local array
Dell softraid FW uses homehost in md raid superblock to store
its virtual disk name e.g. "VirtualDisk01". The improper usage
@@ -24,17 +22,17 @@
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/super1.c b/super1.c
-index 7664883..d15067a 100644
+index fe3c4c6..2ad373d 100644
--- a/super1.c
+++ b/super1.c
-@@ -954,8 +954,25 @@ static int examine_badblocks_super1(struct supertype *st,
int fd, char *devname)
+@@ -958,8 +958,25 @@ static int examine_badblocks_super1(struct supertype *st,
int fd, char *devname)
static int match_home1(struct supertype *st, char *homehost)
{
struct mdp_superblock_1 *sb = st->sb;
- int l = homehost ? strlen(homehost) : 0;
+ char *dell_softraid_header = "VirtualDisk";
+ int l = strlen(dell_softraid_header);
-+
+
+ /*
+ * Dell softraid FW uses homehost in md raid superblock to store
+ * its virtual disk name e.g. "VirtualDisk01". The improper usage
@@ -48,13 +46,13 @@
+ */
+ if (strncmp(sb->set_name, dell_softraid_header, l) == 0)
+ return 1;
-
++
+ /* Normal cases handleing */
+ l = homehost ? strlen(homehost) : 0;
return (l > 0 && l < 32 && sb->set_name[l] == ':' &&
strncmp(sb->set_name, homehost, l) == 0);
}
--
-2.26.2
+2.48.1
++++++ 1004-call-mdadm_env.sh-from-usr-libexec-mdadm.patch ++++++
--- /var/tmp/diff_new_pack.DzSaEE/_old 2025-03-03 16:04:42.218181697 +0100
+++ /var/tmp/diff_new_pack.DzSaEE/_new 2025-03-03 16:04:42.222181864 +0100
@@ -1,9 +1,7 @@
-From 6e79d4bd229e5db4e435917daf4c57cd79db9265 Mon Sep 17 00:00:00 2001
+From 8a5cf693f728f55456b18d79b2313adc4ea4bc43 Mon Sep 17 00:00:00 2001
From: colyli <col...@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
+Subject: [PATCH 1004/1005] Call mdadm_env.sh from /usr/libexec/mdadm
Current Makefile installs mdadm_env.sh to /usr/libexec/mdadm but the
systemd service files call it from /usr/lib/mdadm. This patch changes
@@ -12,13 +10,16 @@
Signed-off-by: Coly Li <col...@suse.de>
---
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ systemd/mdcheck_continue.service | 2 ++
+ systemd/mdcheck_start.service | 2 ++
+ systemd/mdmonitor-oneshot.service | 2 +-
+ systemd/mdmonitor.service | 2 +-
+ 4 files changed, 6 insertions(+), 2 deletions(-)
-Index: mdadm-4.3/systemd/mdcheck_continue.service
-===================================================================
---- mdadm-4.3.orig/systemd/mdcheck_continue.service
-+++ mdadm-4.3/systemd/mdcheck_continue.service
+diff --git a/systemd/mdcheck_continue.service
b/systemd/mdcheck_continue.service
+index 70892a1..454b92f 100644
+--- a/systemd/mdcheck_continue.service
++++ b/systemd/mdcheck_continue.service
@@ -13,4 +13,6 @@ Documentation=man:mdadm(8)
[Service]
Type=oneshot
@@ -26,10 +27,10 @@
+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
+diff --git a/systemd/mdcheck_start.service b/systemd/mdcheck_start.service
+index fc4fc43..a1077f0 100644
+--- a/systemd/mdcheck_start.service
++++ b/systemd/mdcheck_start.service
@@ -13,4 +13,6 @@ Documentation=man:mdadm(8)
[Service]
Type=oneshot
@@ -37,10 +38,10 @@
+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
+diff --git a/systemd/mdmonitor-oneshot.service
b/systemd/mdmonitor-oneshot.service
+index ba86b44..3b9d073 100644
+--- a/systemd/mdmonitor-oneshot.service
++++ b/systemd/mdmonitor-oneshot.service
@@ -12,5 +12,5 @@ Documentation=man:mdadm(8)
[Service]
Environment=MDADM_MONITOR_ARGS=--scan
@@ -48,10 +49,10 @@
-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
+diff --git a/systemd/mdmonitor.service b/systemd/mdmonitor.service
+index 9c36478..71cf4fe 100644
+--- a/systemd/mdmonitor.service
++++ b/systemd/mdmonitor.service
@@ -13,5 +13,5 @@ Documentation=man:mdadm(8)
[Service]
Environment= MDADM_MONITOR_ARGS=--scan
@@ -59,4 +60,7 @@
-ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh
+ExecStartPre=-/usr/libexec/mdadm/mdadm_env.sh
ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
+--
+2.48.1
+
++++++ 1005-mdadm-enable-Intel-Alderlake-RSTe-configuration.patch ++++++
--- /var/tmp/diff_new_pack.DzSaEE/_old 2025-03-03 16:04:42.238182534 +0100
+++ /var/tmp/diff_new_pack.DzSaEE/_new 2025-03-03 16:04:42.242182701 +0100
@@ -1,9 +1,7 @@
-From 449c8b62164880ab132ad6eec86a8d53f793af69 Mon Sep 17 00:00:00 2001
+From 4134725e0b08ec47d9c45f5bec6991591b0a06b7 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Tue, 19 Jul 2022 13:18:23 +0800
-Subject: [PATCH 19/23] mdadm: enable Intel Alderlake RSTe configuration
-Patch-mainline: N/A, SUSE only patch
-References: bsc#1201297
+Subject: [PATCH 1005/1005] mdadm: enable Intel Alderlake RSTe configuration
Alderlake has a slightly different RST configuration; the UEFI
variable is name 'RstVmdV', and the AHCI controller shows up as
@@ -13,14 +11,14 @@
Signed-off-by: Hannes Reinecke <h...@suse.de>
Acked-by: Coly Li <col...@suse.de>
---
- platform-intel.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ platform-intel.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
-Index: mdadm-4.2/platform-intel.c
-===================================================================
---- mdadm-4.2.orig/platform-intel.c
-+++ mdadm-4.2/platform-intel.c
-@@ -512,6 +512,7 @@ static const struct imsm_orom *find_imsm
+diff --git a/platform-intel.c b/platform-intel.c
+index 95bc492..6623ac5 100644
+--- a/platform-intel.c
++++ b/platform-intel.c
+@@ -652,10 +652,12 @@ static const struct imsm_orom *find_imsm_hba_orom(struct
sys_dev *hba)
#define AHCI_PROP "RstSataV"
#define AHCI_SSATA_PROP "RstsSatV"
#define AHCI_TSATA_PROP "RsttSatV"
@@ -28,26 +26,13 @@
#define VROC_VMD_PROP "RstUefiV"
#define RST_VMD_PROP "RstVmdV"
-@@ -519,6 +520,7 @@ static const struct imsm_orom *find_imsm
- EFI_GUID(0x193dfefa, 0xa445, 0x4302, 0x99, 0xd8, 0xef, 0x3a, 0xad,
0x1a, 0x04, 0xc6)
-
#define PCI_CLASS_RAID_CNTRL 0x010400
+#define PCI_CLASS_SATA_HBA 0x010601
- static int read_efi_var(void *buffer, ssize_t buf_size,
- const char *variable_name, struct efi_guid guid)
-@@ -605,7 +607,8 @@ const struct imsm_orom *find_imsm_efi(st
- struct imsm_orom orom;
- struct orom_entry *ret;
- static const char * const sata_efivars[] = {AHCI_PROP, AHCI_SSATA_PROP,
-- AHCI_TSATA_PROP};
-+ AHCI_TSATA_PROP,
-+ AHCI_RST_PROP};
- static const char * const vmd_efivars[] = {VROC_VMD_PROP, RST_VMD_PROP};
- unsigned long i;
-
-@@ -624,7 +627,8 @@ const struct imsm_orom *find_imsm_efi(st
-
+ /* GUID length in Bytes */
+ #define GUID_LENGTH 16
+@@ -1049,7 +1051,8 @@ const struct imsm_orom *find_imsm_efi(struct sys_dev
*hba)
+ break;
return NULL;
case SYS_DEV_SATA:
- if (hba->class != PCI_CLASS_RAID_CNTRL)
@@ -55,5 +40,8 @@
+ hba->class != PCI_CLASS_SATA_HBA)
return NULL;
- for (i = 0; i < ARRAY_SIZE(sata_efivars); i++) {
+ if (find_imsm_efi_orom(&orom, hba->type))
+--
+2.48.1
+
++++++ _service ++++++
<?xml version="1.0"?>
<services>
<service name="obs_scm" mode="manual">
<param name="scm">git</param>
<param
name="url">https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git</param>
<param name="filename">mdadm</param>
<param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@+g%h</param>
<param name="revision">mdadm-4.4</param>
<param name="match-tag">mdadm-[0-9].[0-9]*</param>
<param
name="versionrewrite-pattern">mdadm-([0-9]\.[0-9]+)((\+0\+g[0-9a-f]+)|(\+[1-9][0-9]*\+g[0-9a-f]+))</param>
<param name="versionrewrite-replacement">\1\4</param>
<param name="changesgenerate">enable</param>
</service>
<service name="set_version" mode="manual"/>
<service mode="buildtime" name="tar"/>
</services>
++++++ mdadm.obsinfo ++++++
name: mdadm
version: 4.4
mtime: 1734083693
commit: 8e56efac9afd7080bb42bae4b77cdad5f345633a
