mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-22 21:53:32 +00:00
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.
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Nikolay Amiantov <ab@fmap.me>
|
|
Date: Thu, 25 Jul 2019 20:45:55 +0300
|
|
Subject: [PATCH] systemd-shutdown: execute scripts in
|
|
/etc/systemd/system-shutdown
|
|
|
|
This is needed for NixOS to use such scripts as systemd directory is immutable.
|
|
---
|
|
src/shutdown/shutdown.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
|
|
index 2c3cbec02c..1b876203c6 100644
|
|
--- a/src/shutdown/shutdown.c
|
|
+++ b/src/shutdown/shutdown.c
|
|
@@ -335,7 +335,7 @@ int main(int argc, char *argv[]) {
|
|
_cleanup_free_ char *cgroup = NULL;
|
|
char *arguments[3];
|
|
int cmd, r, umount_log_level = LOG_INFO;
|
|
- static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL};
|
|
+ static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, "/etc/systemd/system-shutdown", NULL};
|
|
|
|
/* The log target defaults to console, but the original systemd process will pass its log target in through a
|
|
* command line argument, which will override this default. Also, ensure we'll never log to the journal or
|