From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Thu, 15 Mar 2012 12:19:34 +0000 (-0300)
Subject: config: use order /etc, /run, /lib
X-Git-Tag: v7~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=436da1e96efff42e2adaa632bff20efdc91f570d;p=thirdparty%2Fkmod.git

config: use order /etc, /run, /lib

This matches the change in systemd and udev. Log message on udev's
change by Kay Sievers:

	After long consideration we came to the conclusion that user
	configuration in /etc should always override the (generally
	computer generated) configuration in /run. User configuration
	should always be what matters over anything else. Hence rearrange
	the search orders accordingly. In general this should change
	very little as overriding like this is seldomn done so far,
	and the order between /etc and /usr stays the same.
---

diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 02f3b14b..36ca629b 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -59,8 +59,8 @@ static struct _index_files {
 };
 
 static const char *default_config_paths[] = {
-	"/run/modprobe.d",
 	SYSCONFDIR "/modprobe.d",
+	"/run/modprobe.d",
 	ROOTPREFIX "/lib/modprobe.d",
 	NULL
 };