summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
45dc3a0)
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.
</refnamediv>
<refsynopsisdiv>
</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>/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>
</refsynopsisdiv>
<refsect1>
</refnamediv>
<refsynopsisdiv>
</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>/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>
</refsynopsisdiv>
<refsect1>
</refnamediv>
<refsynopsisdiv>
</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>/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>
</refsynopsisdiv>
<refsect1>
</refnamediv>
<refsynopsisdiv>
</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>/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>
</refsynopsisdiv>
<refsect1>
write_one_line_file("/proc/sys/fs/binfmt_misc/status", "-1");
r = conf_files_list(&files, ".conf",
write_one_line_file("/proc/sys/fs/binfmt_misc/status", "-1");
r = conf_files_list(&files, ".conf",
"/usr/local/lib/binfmt.d",
"/usr/lib/binfmt.d",
NULL);
"/usr/local/lib/binfmt.d",
"/usr/lib/binfmt.d",
NULL);
kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
if (conf_files_list(&files, ".conf",
kmod_set_log_fn(ctx, systemd_kmod_log, NULL);
if (conf_files_list(&files, ".conf",
"/usr/local/lib/modules-load.d",
"/usr/lib/modules-load.d",
"/lib/modules-load.d",
"/usr/local/lib/modules-load.d",
"/usr/lib/modules-load.d",
"/lib/modules-load.d",
static char** user_dirs(void) {
const char * const config_unit_paths[] = {
static char** user_dirs(void) {
const char * const config_unit_paths[] = {
USER_CONFIG_UNIT_PATH,
"/etc/systemd/user",
USER_CONFIG_UNIT_PATH,
"/etc/systemd/user",
/* If you modify this you also want to modify
* systemduserunitpath= in systemd.pc.in, and
* the arrays in user_dirs() above! */
/* If you modify this you also want to modify
* systemduserunitpath= in systemd.pc.in, and
* the arrays in user_dirs() above! */
USER_CONFIG_UNIT_PATH,
"/etc/systemd/user",
USER_CONFIG_UNIT_PATH,
"/etc/systemd/user",
"/usr/local/lib/systemd/user",
"/usr/local/share/systemd/user",
USER_DATA_UNIT_PATH,
"/usr/local/lib/systemd/user",
"/usr/local/share/systemd/user",
USER_DATA_UNIT_PATH,
if (!(p->unit_path = strv_new(
/* If you modify this you also want to modify
* systemdsystemunitpath= in systemd.pc.in! */
if (!(p->unit_path = strv_new(
/* If you modify this you also want to modify
* systemdsystemunitpath= in systemd.pc.in! */
SYSTEM_CONFIG_UNIT_PATH,
"/etc/systemd/system",
SYSTEM_CONFIG_UNIT_PATH,
"/etc/systemd/system",
"/usr/local/lib/systemd/system",
"/usr/lib/systemd/system",
SYSTEM_DATA_UNIT_PATH,
"/usr/local/lib/systemd/system",
"/usr/lib/systemd/system",
SYSTEM_DATA_UNIT_PATH,
char **files, **f;
r = conf_files_list(&files, ".conf",
char **files, **f;
r = conf_files_list(&files, ".conf",
"/usr/local/lib/sysctl.d",
"/usr/lib/sysctl.d",
"/lib/sysctl.d",
"/usr/local/lib/sysctl.d",
"/usr/lib/sysctl.d",
"/lib/sysctl.d",
systemduserunitdir=@userunitdir@
systemdsystemconfdir=@pkgsysconfdir@/system
systemduserconfdir=@pkgsysconfdir@/user
systemduserunitdir=@userunitdir@
systemdsystemconfdir=@pkgsysconfdir@/system
systemduserconfdir=@pkgsysconfdir@/user
-systemdsystemunitpath=/run/systemd/system:${systemdsystemconfdir}:/etc/systemd/system:/usr/local/share/systemd/system:/usr/local/lib/systemd/system:/usr/share/systemd/system:/usr/lib/systemd/system:/lib/systemd/system:${systemdsystemunitdir}
-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/usr/local/share/systemd/user:/usr/local/lib/systemd/user:/usr/share/systemd/user:/usr/lib/systemd/user:${systemduserunitdir}
+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/share/systemd/system:/usr/local/lib/systemd/system:/usr/share/systemd/system:/usr/lib/systemd/system:/lib/systemd/system:${systemdsystemunitdir}
+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/share/systemd/user:/usr/local/lib/systemd/user:/usr/share/systemd/user:/usr/lib/systemd/user:${systemduserunitdir}
Name: systemd
Description: systemd System and Service Manager
Name: systemd
Description: systemd System and Service Manager
char **files, **f;
r = conf_files_list(&files, ".conf",
char **files, **f;
r = conf_files_list(&files, ".conf",
"/usr/local/lib/tmpfiles.d",
"/usr/lib/tmpfiles.d",
NULL);
"/usr/local/lib/tmpfiles.d",
"/usr/lib/tmpfiles.d",
NULL);