wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-29 12:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follw-up to 4894580, unbreak TTYs

Browse Source 
The TTY and log configuration is overloaded using a union in svc_t, so
we cannot "reset" the log attribute on reload.  In fact, a TTY should
never be allowed to have a tty:anything set, so change the parser to
ignore log options for ttys.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2023-02-06 15:47:19 +01:00
1 parent 48e1a0b17f
commit 4f8a5a6531
1 file changed
+6 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/service.c
+6 -4
View File
@@ -1654,10 +1654,12 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
parse_script("ready", ready_script, svc->ready_script, sizeof(svc->ready_script)); parse_script("ready", ready_script, svc->ready_script, sizeof(svc->ready_script));
else else
memset(svc->ready_script, 0, sizeof(svc->ready_script)); memset(svc->ready_script, 0, sizeof(svc->ready_script));
if (log) if (!svc_is_tty(svc)) {
parse_log(svc, log); if (log)
else parse_log(svc, log);
svc->log.enabled = 0; else
svc->log.enabled = 0;
}
if (notify) { if (notify) {
int type = parse_notify(notify); int type = parse_notify(notify);