125 lines
6.4 KiB
Diff
125 lines
6.4 KiB
Diff
From e5d73359928b79bd846bda29ce61fe276d8c0b76 Mon Sep 17 00:00:00 2001
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
Date: Fri, 19 Dec 2014 14:46:17 +0100
|
|
Subject: [PATCH 05/18] Add some NixOS-specific unit directories
|
|
|
|
Look in `/nix/var/nix/profiles/default/lib/systemd` for units provided
|
|
by packages installed into the default profile via
|
|
`nix-env -iA nixos.$package`, and into `/etc/systemd-mutable/system` for
|
|
persistent, mutable units (used for Dysnomia).
|
|
|
|
Also, remove /usr and /lib as these don't exist on NixOS.
|
|
---
|
|
src/basic/path-lookup.c | 20 +++++---------------
|
|
src/core/systemd.pc.in | 5 +++--
|
|
2 files changed, 8 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
|
|
index 52968dee34..bba2eb09b8 100644
|
|
--- a/src/basic/path-lookup.c
|
|
+++ b/src/basic/path-lookup.c
|
|
@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
|
|
}
|
|
|
|
static const char* const user_data_unit_paths[] = {
|
|
- "/usr/local/lib/systemd/user",
|
|
- "/usr/local/share/systemd/user",
|
|
USER_DATA_UNIT_DIR,
|
|
- "/usr/lib/systemd/user",
|
|
- "/usr/share/systemd/user",
|
|
NULL
|
|
};
|
|
|
|
static const char* const user_config_unit_paths[] = {
|
|
USER_CONFIG_UNIT_DIR,
|
|
"/etc/systemd/user",
|
|
+ "/etc/systemd-mutable/user",
|
|
NULL
|
|
};
|
|
|
|
@@ -616,15 +613,14 @@ int lookup_paths_init(
|
|
persistent_config,
|
|
SYSTEM_CONFIG_UNIT_DIR,
|
|
"/etc/systemd/system",
|
|
+ "/etc/systemd-mutable/system",
|
|
+ "/nix/var/nix/profiles/default/lib/systemd/system",
|
|
STRV_IFNOTNULL(persistent_attached),
|
|
runtime_config,
|
|
"/run/systemd/system",
|
|
STRV_IFNOTNULL(runtime_attached),
|
|
STRV_IFNOTNULL(generator),
|
|
- "/usr/local/lib/systemd/system",
|
|
SYSTEM_DATA_UNIT_PATH,
|
|
- "/usr/lib/systemd/system",
|
|
- STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL),
|
|
STRV_IFNOTNULL(generator_late));
|
|
break;
|
|
|
|
@@ -640,14 +636,12 @@ int lookup_paths_init(
|
|
persistent_config,
|
|
USER_CONFIG_UNIT_DIR,
|
|
"/etc/systemd/user",
|
|
+ "/etc/systemd-mutable/user",
|
|
+ "/nix/var/nix/profiles/default/lib/systemd/user",
|
|
runtime_config,
|
|
"/run/systemd/user",
|
|
STRV_IFNOTNULL(generator),
|
|
- "/usr/local/share/systemd/user",
|
|
- "/usr/share/systemd/user",
|
|
- "/usr/local/lib/systemd/user",
|
|
USER_DATA_UNIT_DIR,
|
|
- "/usr/lib/systemd/user",
|
|
STRV_IFNOTNULL(generator_late));
|
|
break;
|
|
|
|
@@ -797,7 +791,6 @@ char **generator_binary_paths(UnitFileScope scope) {
|
|
case UNIT_FILE_SYSTEM:
|
|
add = strv_new("/run/systemd/system-generators",
|
|
"/etc/systemd/system-generators",
|
|
- "/usr/local/lib/systemd/system-generators",
|
|
SYSTEM_GENERATOR_DIR);
|
|
break;
|
|
|
|
@@ -805,7 +798,6 @@ char **generator_binary_paths(UnitFileScope scope) {
|
|
case UNIT_FILE_USER:
|
|
add = strv_new("/run/systemd/user-generators",
|
|
"/etc/systemd/user-generators",
|
|
- "/usr/local/lib/systemd/user-generators",
|
|
USER_GENERATOR_DIR);
|
|
break;
|
|
|
|
@@ -844,12 +836,10 @@ char **env_generator_binary_paths(bool is_system) {
|
|
if (is_system)
|
|
add = strv_new("/run/systemd/system-environment-generators",
|
|
"/etc/systemd/system-environment-generators",
|
|
- "/usr/local/lib/systemd/system-environment-generators",
|
|
SYSTEM_ENV_GENERATOR_DIR);
|
|
else
|
|
add = strv_new("/run/systemd/user-environment-generators",
|
|
"/etc/systemd/user-environment-generators",
|
|
- "/usr/local/lib/systemd/user-environment-generators",
|
|
USER_ENV_GENERATOR_DIR);
|
|
|
|
if (!add)
|
|
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
|
|
index 8424837824..b1c541bc52 100644
|
|
--- a/src/core/systemd.pc.in
|
|
+++ b/src/core/systemd.pc.in
|
|
@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir}
|
|
systemd_user_conf_dir=${sysconfdir}/systemd/user
|
|
systemduserconfdir=${systemd_user_conf_dir}
|
|
|
|
-systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system
|
|
+systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir}
|
|
systemdsystemunitpath=${systemd_system_unit_path}
|
|
|
|
-systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user
|
|
+systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir}
|
|
+
|
|
systemduserunitpath=${systemd_user_unit_path}
|
|
|
|
systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators
|
|
--
|
|
2.27.0
|
|
|