diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-01-22 14:30:22 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-01-22 14:30:22 +0200 |
| commit | 3f610177adb844248fe37f52eb713d462e833a62 (patch) | |
| tree | 65623c25044b4ff0315ce8095e682cfe45ceb586 | |
| parent | 009df5cb3cec5108a66538503bd63a8bd6f8addf (diff) | |
| download | emacs-3f610177adb844248fe37f52eb713d462e833a62.tar.gz | |
Avoid sending systemd shutdown notifications if non-daemon
* src/emacs.c (Fkill_emacs): Send the shutdown notification only
in daemon mode. (Bug#46022)
| -rw-r--r-- | src/emacs.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c index f2e858f13bb..67220ebb769 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -187,7 +187,8 @@ bool build_details; /* Name for the server started by the daemon.*/ static char *daemon_name; -/* 0 not a daemon, 1 new-style (foreground), 2 old-style (background). */ +/* 0 not a daemon, 1 new-style (foreground), 2 old-style (background). + A negative value means the daemon initialization was already done. */ int daemon_type; #ifndef WINDOWSNT @@ -2371,7 +2372,10 @@ all of which are called before Emacs is actually killed. */ int exit_code; #ifdef HAVE_LIBSYSTEMD - sd_notify(0, "STOPPING=1"); + /* Notify systemd we are shutting down, but only if we have notified + it about startup. */ + if (daemon_type == -1) + sd_notify(0, "STOPPING=1"); #endif /* HAVE_LIBSYSTEMD */ /* Fsignal calls emacs_abort () if it sees that waiting_for_input is @@ -2876,7 +2880,7 @@ from the parent process and its tty file descriptors. */) } /* Set it to an invalid value so we know we've already run this function. */ - daemon_type = -1; + daemon_type = -daemon_type; #else /* WINDOWSNT */ /* Signal the waiting emacsclient process. */ |