46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
diff -Nru mdadm-4.3.orig/mdadm.h mdadm-4.3/mdadm.h
|
|
--- mdadm-4.3.orig/mdadm.h 2024-02-22 10:01:11.637922391 +0100
|
|
+++ mdadm-4.3/mdadm.h 2024-02-22 10:01:31.351255810 +0100
|
|
@@ -1775,7 +1775,7 @@
|
|
bool stat_is_md_dev(struct stat *st);
|
|
extern char *fd2devnm(int fd);
|
|
|
|
-extern int in_initrd(void);
|
|
+extern int mdadm_in_initrd(void);
|
|
|
|
struct cmap_hooks {
|
|
void *cmap_handle; /* corosync lib related */
|
|
diff -Nru mdadm-4.3.orig/mdmon.c mdadm-4.3/mdmon.c
|
|
--- mdadm-4.3.orig/mdmon.c 2024-02-22 10:01:11.637922391 +0100
|
|
+++ mdadm-4.3/mdmon.c 2024-02-22 10:01:31.351255810 +0100
|
|
@@ -358,7 +358,7 @@
|
|
}
|
|
}
|
|
|
|
- if (in_initrd()) {
|
|
+ if (mdadm_in_initrd()) {
|
|
/*
|
|
* set first char of argv[0] to @. This is used by
|
|
* systemd to signal that the task was launched from
|
|
diff -Nru mdadm-4.3.orig/util.c mdadm-4.3/util.c
|
|
--- mdadm-4.3.orig/util.c 2024-02-22 10:01:11.641255725 +0100
|
|
+++ mdadm-4.3/util.c 2024-02-22 10:03:34.587922997 +0100
|
|
@@ -1960,7 +1960,7 @@
|
|
int len;
|
|
pid_t pid;
|
|
int status;
|
|
- char *prefix = in_initrd() ? "initrd-" : "";
|
|
+ char *prefix = mdadm_in_initrd() ? "initrd-" : "";
|
|
char pathbuf[1024];
|
|
char *paths[4] = {
|
|
pathbuf,
|
|
@@ -2270,7 +2270,7 @@
|
|
return 0;
|
|
}
|
|
|
|
-int in_initrd(void)
|
|
+int mdadm_in_initrd(void)
|
|
{
|
|
return access("/etc/initrd-release", F_OK) >= 0;
|
|
}
|