forked from pool/mdadm
90d4e6869d
- Update mdadm to latest upstream state upto commit
582945c2d3bb. (jsc#PED-7542)
1) The testing changes are not included here.
2) Code clean up, and more helper routines added for Manage.c,
Monitor.c, mdadm.c, ReadMe.c, super-intel.c, super0.c, super1.c,
Create.c, Incremental.c and so on.
3) Man page update for mdadm.8.in.
4) Several memory leak and double free fixes.
5) Check /etc/initrd-release for whether systemd running on an initrd.
- Manage: Block unsafe member failing
0062-Manage-Block-unsafe-member-failing.patch
- Mdmonitor: Split alert() into separate functions
0063-Mdmonitor-Split-alert-into-separate-functions.patch
- Monitor: block if monitor modes are combined.
0064-Monitor-block-if-monitor-modes-are-combined.patch
- Update mdadm Monitor manual.
0065-Update-mdadm-Monitor-manual.patch
- mdadm: create ident_init()
0066-mdadm-create-ident_init.patch
- mdadm: Add option validation for --update-subarray
0067-mdadm-Add-option-validation-for-update-subarray.patch
- Fix --update-subarray on active volume
0068-Fix-update-subarray-on-active-volume.patch
- Add code specific update options to enum.
0069-Add-code-specific-update-options-to-enum.patch
- super-ddf: Remove update_super_ddf.
0070-super-ddf-Remove-update_super_ddf.patch
- super0: refactor the code for enum
0071-super0-refactor-the-code-for-enum.patch
- super1: refactor the code for enum
OBS-URL: https://build.opensuse.org/request/show/1137473
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=231
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From eb45d0add7cf2918f838bec2d93d99cf2d9c662f Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.de>
|
|
Date: Mon, 13 Mar 2023 14:42:58 +1100
|
|
Subject: [PATCH] Use existence of /etc/initrd-release to detect initrd.
|
|
|
|
Since v183, systemd has used the existence of /etc/initrd-release to
|
|
detect if it is running in an initrd, rather than looking at the magic
|
|
number of the root filesystem's device. It is time for mdadm to do the
|
|
same.
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
|
|
---
|
|
util.c | 10 +---------
|
|
1 file changed, 1 insertion(+), 9 deletions(-)
|
|
|
|
diff --git a/util.c b/util.c
|
|
index 9f1e1f7..509fb43 100644
|
|
--- a/util.c
|
|
+++ b/util.c
|
|
@@ -2227,15 +2227,7 @@ int continue_via_systemd(char *devnm, char *service_name)
|
|
|
|
int in_initrd(void)
|
|
{
|
|
- /* This is based on similar function in systemd. */
|
|
- struct statfs s;
|
|
- /* statfs.f_type is signed long on s390x and MIPS, causing all
|
|
- sorts of sign extension problems with RAMFS_MAGIC being
|
|
- defined as 0x858458f6 */
|
|
- return statfs("/", &s) >= 0 &&
|
|
- ((unsigned long)s.f_type == TMPFS_MAGIC ||
|
|
- ((unsigned long)s.f_type & 0xFFFFFFFFUL) ==
|
|
- ((unsigned long)RAMFS_MAGIC & 0xFFFFFFFFUL));
|
|
+ return access("/etc/initrd-release", F_OK) >= 0;
|
|
}
|
|
|
|
void reopen_mddev(int mdfd)
|
|
--
|
|
2.35.3
|
|
|