]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #4428 from lnykryn/ctrl_v2
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sun, 23 Oct 2016 03:16:11 +0000 (23:16 -0400)
committerGitHub <noreply@github.com>
Sun, 23 Oct 2016 03:16:11 +0000 (23:16 -0400)
rename failure-action to emergency-action and use it for ctrl+alt+del burst

1  2 
src/core/service.c

Simple merge