mdadm-4.3-in_initrd-collision.patch (1301B)
1 diff -Nru mdadm-4.3.orig/mdadm.h mdadm-4.3/mdadm.h 2 --- mdadm-4.3.orig/mdadm.h 2024-02-22 10:01:11.637922391 +0100 3 +++ mdadm-4.3/mdadm.h 2024-02-22 10:01:31.351255810 +0100 4 @@ -1775,7 +1775,7 @@ 5 bool stat_is_md_dev(struct stat *st); 6 extern char *fd2devnm(int fd); 7 8 -extern int in_initrd(void); 9 +extern int mdadm_in_initrd(void); 10 11 struct cmap_hooks { 12 void *cmap_handle; /* corosync lib related */ 13 diff -Nru mdadm-4.3.orig/mdmon.c mdadm-4.3/mdmon.c 14 --- mdadm-4.3.orig/mdmon.c 2024-02-22 10:01:11.637922391 +0100 15 +++ mdadm-4.3/mdmon.c 2024-02-22 10:01:31.351255810 +0100 16 @@ -358,7 +358,7 @@ 17 } 18 } 19 20 - if (in_initrd()) { 21 + if (mdadm_in_initrd()) { 22 /* 23 * set first char of argv[0] to @. This is used by 24 * systemd to signal that the task was launched from 25 diff -Nru mdadm-4.3.orig/util.c mdadm-4.3/util.c 26 --- mdadm-4.3.orig/util.c 2024-02-22 10:01:11.641255725 +0100 27 +++ mdadm-4.3/util.c 2024-02-22 10:03:34.587922997 +0100 28 @@ -1960,7 +1960,7 @@ 29 int len; 30 pid_t pid; 31 int status; 32 - char *prefix = in_initrd() ? "initrd-" : ""; 33 + char *prefix = mdadm_in_initrd() ? "initrd-" : ""; 34 char pathbuf[1024]; 35 char *paths[4] = { 36 pathbuf, 37 @@ -2270,7 +2270,7 @@ 38 return 0; 39 } 40 41 -int in_initrd(void) 42 +int mdadm_in_initrd(void) 43 { 44 return access("/etc/initrd-release", F_OK) >= 0; 45 }