From fc1a2e06a2eab6ca16664adb83b61fe958f00598 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 Mar 2012 14:25:05 +0100
Subject: conf: when looking for configurations look in /etc first, in /run
 second

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.
---
 man/binfmt.d.xml       | 2 +-
 man/modules-load.d.xml | 2 +-
 man/sysctl.d.xml       | 2 +-
 man/tmpfiles.d.xml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'man')

diff --git a/man/binfmt.d.xml b/man/binfmt.d.xml
index 966778ded2..f5ec805e29 100644
--- a/man/binfmt.d.xml
+++ b/man/binfmt.d.xml
@@ -46,9 +46,9 @@
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>/usr/lib/binfmt.d/*.conf</filename></para>
                 <para><filename>/etc/binfmt.d/*.conf</filename></para>
                 <para><filename>/run/binfmt.d/*.conf</filename></para>
+                <para><filename>/usr/lib/binfmt.d/*.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
diff --git a/man/modules-load.d.xml b/man/modules-load.d.xml
index b633663475..e2f7d5c68c 100644
--- a/man/modules-load.d.xml
+++ b/man/modules-load.d.xml
@@ -46,9 +46,9 @@
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>/usr/lib/modules-load.d/*.conf</filename></para>
                 <para><filename>/etc/modules-load.d/*.conf</filename></para>
                 <para><filename>/run/modules-load.d/*.conf</filename></para>
+                <para><filename>/usr/lib/modules-load.d/*.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml
index 240aa81137..9c108b0b7c 100644
--- a/man/sysctl.d.xml
+++ b/man/sysctl.d.xml
@@ -46,9 +46,9 @@
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>/usr/lib/sysctl.d/*.conf</filename></para>
                 <para><filename>/etc/sysctl.d/*.conf</filename></para>
                 <para><filename>/run/sysctl.d/*.conf</filename></para>
+                <para><filename>/usr/lib/sysctl.d/*.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml
index b6bf3630e9..f70bf0ef9f 100644
--- a/man/tmpfiles.d.xml
+++ b/man/tmpfiles.d.xml
@@ -47,9 +47,9 @@
         </refnamediv>
 
         <refsynopsisdiv>
-                <para><filename>/usr/lib/tmpfiles.d/*.conf</filename></para>
                 <para><filename>/etc/tmpfiles.d/*.conf</filename></para>
                 <para><filename>/run/tmpfiles.d/*.conf</filename></para>
+                <para><filename>/usr/lib/tmpfiles.d/*.conf</filename></para>
         </refsynopsisdiv>
 
         <refsect1>
-- 
cgit v1.2.3-54-g00ecf