mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 02:03:01 +00:00
40eff710af
Reverts NixOS/nixpkgs#269620 -eab0837b68caused a mass-rebuild on master - self-merge on a critical package without review and not waiting for the active owner team Below are the reverts of the commits from that PR Revert "systemd: migrate to by-name" This reverts commit33d2a40d67. Revert "systemd: add meta.longDescription" This reverts commit7c588d141d. Revert "systemd: cosmetic rewording of code" This reverts commitd91b8d9fcb. Revert "systemd: cosmetic rewording of comments" This reverts commitbc563998c0. Revert "systemd: remove some redundancy on mesonFlags" This reverts commiteab0837b68. Revert "systemd: use lib.meson* functions" This reverts commit1129756b1a.
24 lines
839 B
Diff
24 lines
839 B
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 | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
|
|
index 8395bb429d..14fbc85bb4 100644
|
|
--- a/src/shutdown/shutdown.c
|
|
+++ b/src/shutdown/shutdown.c
|
|
@@ -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;
|