From: NeilBrown <neilb@suse.de>
Date: Thu, 3 May 2012 04:16:51 +0000 (+1000)
Subject: Update test for "is udev active".
X-Git-Tag: mdadm-3.2.4~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ffdc2dd443d363b790c0ab9171a0b3265cb6fce;p=thirdparty%2Fmdadm.git

Update test for "is udev active".

Newer udev doesn't use /dev/.udev any more. it used
/run/udev instead.
So test for that as well.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/mdopen.c b/mdopen.c
index eac1c1fc..fdae7f3e 100644
--- a/mdopen.c
+++ b/mdopen.c
@@ -321,7 +321,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
 	 * If we cannot detect udev, we need to make
 	 * devices and links ourselves.
 	 */
-	if (stat("/dev/.udev", &stb) != 0 ||
+	if ((stat("/dev/.udev", &stb) != 0 && stat("/run/udev", &stb) != 0) ||
 	    check_env("MDADM_NO_UDEV")) {
 		/* Make sure 'devname' exists and 'chosen' is a symlink to it */
 		if (lstat(devname, &stb) == 0) {