blob: 54e4aadacb584a2951fff4d8797382c881a62994 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
Fix collision with libudev symbols when statically linking.
https://bugs.gentoo.org/830485
--- a/mdadm.h
+++ b/mdadm.h
@@ -1665,7 +1665,7 @@
extern void udev_block(char *devnm);
extern void udev_unblock(void);
-extern int in_initrd(void);
+extern int mdadm_in_initrd(void);
struct cmap_hooks {
void *cmap_handle; /* corosync lib related */
--- a/mdmon.c
+++ b/mdmon.c
@@ -309,7 +309,7 @@
{NULL, 0, NULL, 0}
};
- 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
--- a/util.c
+++ b/util.c
@@ -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,
@@ -2219,7 +2219,7 @@
return 0;
}
-int in_initrd(void)
+int mdadm_in_initrd(void)
{
/* This is based on similar function in systemd. */
struct statfs s;
|
