summary refs log tree commit diff
path: root/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
diff options
context:
space:
mode:
authorWill Fancher <elvishjerricco@gmail.com>2022-11-09 19:29:15 -0500
committerWill Fancher <elvishjerricco@gmail.com>2022-11-16 23:38:25 -0500
commit6925777fe4c1c1581045e0e7b3f83cf01a955d87 (patch)
treead54c1d0b7da698da92a2aee1610d2230971673e /pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
parent14be0e5a7b6d335377780e98a88f3307d6a6a05e (diff)
downloadnixpkgs-6925777fe4c1c1581045e0e7b3f83cf01a955d87.tar
nixpkgs-6925777fe4c1c1581045e0e7b3f83cf01a955d87.tar.gz
nixpkgs-6925777fe4c1c1581045e0e7b3f83cf01a955d87.tar.bz2
nixpkgs-6925777fe4c1c1581045e0e7b3f83cf01a955d87.tar.lz
nixpkgs-6925777fe4c1c1581045e0e7b3f83cf01a955d87.tar.xz
nixpkgs-6925777fe4c1c1581045e0e7b3f83cf01a955d87.tar.zst
nixpkgs-6925777fe4c1c1581045e0e7b3f83cf01a955d87.zip
systemd: 251.8 -> 252.1
Diffstat (limited to 'pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch')
-rw-r--r--pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch21
1 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index 4add87267dd..78d1e48f6cf 100644
--- a/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -6,19 +6,18 @@ Subject: [PATCH] systemd-shutdown: execute scripts in
 
 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(-)
+ src/shutdown/shutdown.c | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index 2c3cbec02c..1b876203c6 100644
+index dcee0f9006..24b03d6948 100644
 --- a/src/shutdown/shutdown.c
 +++ b/src/shutdown/shutdown.c
-@@ -335,7 +335,7 @@ int main(int argc, char *argv[]) {
+@@ -334,6 +334,7 @@ static void init_watchdog(void) {
+ int main(int argc, char *argv[]) {
+         static const char* const dirs[] = {
+                 SYSTEM_SHUTDOWN_PATH,
++                "/etc/systemd/system-shutdown",
+                 NULL
+         };
          _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