ukify: swap the ordering of config search paths

Let's follow our usual ordering.

Follow-up for a05fa30f88e522101c8412deecd7f598e2254b20.

diff --git a/man/ukify.xml b/man/ukify.xml
index a9034bc51114a5581fbb3102327a18522ff26bea..bf6f3285364e685c03339754a48f96ac4b9fa03b 100644 (file)
--- a/man/ukify.xml
+++ b/man/ukify.xml
@@ -167,7 +167,7 @@
 
     <para>If no config file is provided via the option <option>--config=<replaceable>PATH</replaceable></option>,
     <command>ukify</command> will try to look for a default configuration file in the following paths in this
-    order: <filename>/run/systemd/ukify.conf</filename>, <filename>/etc/systemd/ukify.conf</filename>,
+    order: <filename>/etc/systemd/ukify.conf</filename>, <filename>/run/systemd/ukify.conf</filename>,
     <filename>/usr/local/lib/systemd/ukify.conf</filename>, and <filename>/usr/lib/systemd/ukify.conf</filename>,
     and then load the first one found. <command>ukify</command> will proceed normally if no configuration file
     is specified and no default one is found.</para>

diff --git a/src/ukify/ukify.py b/src/ukify/ukify.py
index 50d921b7a80e88151d79ae68e4ff90e82273c003..a21fe48437379b719916b876147dcdcc2eb17095 100755 (executable)
--- a/src/ukify/ukify.py
+++ b/src/ukify/ukify.py
@@ -68,7 +68,7 @@ EFI_ARCHES: list[str] = sum(EFI_ARCH_MAP.values(), [])
 
 # Default configuration directories and file name.
 # When the user does not specify one, the directories are searched in this order and the first file found is used.
-DEFAULT_CONFIG_DIRS = ['/run/systemd', '/etc/systemd', '/usr/local/lib/systemd', '/usr/lib/systemd']
+DEFAULT_CONFIG_DIRS = ['/etc/systemd', '/run/systemd', '/usr/local/lib/systemd', '/usr/lib/systemd']
 DEFAULT_CONFIG_FILE = 'ukify.conf'
 
 class Style: