c9183d3738
The ConditionFileNotEmpty override patch wasn't correct for stage1, which does have the modules in /lib. So, remove the patch and set the right path with overrides in the final system. Also, make sure systemd-tmpfiles-setup-dev is pulled in to create all the necessary symlinks.
123 lines
6.8 KiB
Diff
123 lines
6.8 KiB
Diff
From 0000000000000000000000000000000000000000 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] Add some NixOS-specific unit directories
|
|
|
|
Look in `/nix/var/nix/profiles/default/lib/systemd/{system,user}` for
|
|
units provided by packages installed into the default profile via
|
|
`nix-env -iA nixos.$package`.
|
|
|
|
Also, remove /usr and /lib as these don't exist on NixOS.
|
|
---
|
|
src/basic/path-lookup.c | 17 ++---------------
|
|
src/core/systemd.pc.in | 8 ++++----
|
|
2 files changed, 6 insertions(+), 19 deletions(-)
|
|
|
|
diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
|
|
index 1f4331a8bf..4b9a8ae26e 100644
|
|
--- a/src/basic/path-lookup.c
|
|
+++ b/src/basic/path-lookup.c
|
|
@@ -92,11 +92,7 @@ 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
|
|
};
|
|
|
|
@@ -617,15 +613,13 @@ int lookup_paths_init(
|
|
persistent_config,
|
|
SYSTEM_CONFIG_UNIT_DIR,
|
|
"/etc/systemd/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_DIR,
|
|
- "/usr/lib/systemd/system",
|
|
- STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL),
|
|
STRV_IFNOTNULL(generator_late));
|
|
break;
|
|
|
|
@@ -641,14 +635,11 @@ int lookup_paths_init(
|
|
persistent_config,
|
|
USER_CONFIG_UNIT_DIR,
|
|
"/etc/systemd/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;
|
|
|
|
@@ -808,7 +799,6 @@ char **generator_binary_paths(LookupScope scope) {
|
|
case LOOKUP_SCOPE_SYSTEM:
|
|
add = strv_new("/run/systemd/system-generators",
|
|
"/etc/systemd/system-generators",
|
|
- "/usr/local/lib/systemd/system-generators",
|
|
SYSTEM_GENERATOR_DIR);
|
|
break;
|
|
|
|
@@ -816,7 +806,6 @@ char **generator_binary_paths(LookupScope scope) {
|
|
case LOOKUP_SCOPE_USER:
|
|
add = strv_new("/run/systemd/user-generators",
|
|
"/etc/systemd/user-generators",
|
|
- "/usr/local/lib/systemd/user-generators",
|
|
USER_GENERATOR_DIR);
|
|
break;
|
|
|
|
@@ -855,12 +844,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 693433b34b..5932a21b5b 100644
|
|
--- a/src/core/systemd.pc.in
|
|
+++ b/src/core/systemd.pc.in
|
|
@@ -38,10 +38,10 @@ 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:/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:/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
|
|
@@ -50,10 +50,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir}
|
|
systemd_user_generator_dir=${prefix}/lib/systemd/user-generators
|
|
systemdusergeneratordir=${systemd_user_generator_dir}
|
|
|
|
-systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemd_system_generator_dir}
|
|
+systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:${systemd_system_generator_dir}
|
|
systemdsystemgeneratorpath=${systemd_system_generator_path}
|
|
|
|
-systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:/usr/local/lib/systemd/user-generators:${systemd_user_generator_dir}
|
|
+systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:${systemd_user_generator_dir}
|
|
systemdusergeneratorpath=${systemd_user_generator_path}
|
|
|
|
systemd_sleep_dir=${root_prefix}/lib/systemd/system-sleep
|