06aa5b897f
Resolves: bz1901024 Upstream: Fedora Conflict: None commita2306346bcAuthor: Kairui Song <kasong@redhat.com> Date: Mon Apr 26 17:09:56 2021 +0800 Remove the kdump error handler isolation wrapper The wrapper is introduced in commit002337c, according to the commit message, the only usage of the wrapper is when dracut-initqueue calls "systemctl start emergency" directly. In that case, emergency is started, but not in a isolation mode, which means dracut-initqueue is still running. On the other hand, emergency will call "systemctl start dracut-initqueue" again when default action is dump_to_rootfs. systemd would block on the last dracut-initqueue, waiting for the first instance to exit, which leaves us hang. In previous commit we added initqueue status detect in dump_to_rootfs, so now even without the wrapper, it will not hang. And actually, previously, with the wrapper, emergency might still hang for like 30s. When dracut called emergency service because initqueue timed out, dump_to_rootfs will try start initqueue again and timeout again. Now with the wrapper removed, we can avoid these two kinds of hangs, bacause without the isolation we can detect initqueue service status correctly in such case. Also remove the invalid header comments in service file, the service is not part of systemd code. And sync the service spec with dracut. Signed-off-by: Kairui Song <kasong@redhat.com> Acked-by: Coiby Xu <coxu@redhat.com> Signed-off-by: Kairui Song <kasong@redhat.com>
28 lines
686 B
Desktop File
28 lines
686 B
Desktop File
# This service will run the real kdump error handler code. Executing the
|
|
# failure action configured in kdump.conf
|
|
|
|
[Unit]
|
|
Description=Kdump Error Handler
|
|
DefaultDependencies=no
|
|
After=systemd-vconsole-setup.service
|
|
Wants=systemd-vconsole-setup.service
|
|
|
|
[Service]
|
|
Environment=HOME=/
|
|
Environment=DRACUT_SYSTEMD=1
|
|
Environment=NEWROOT=/sysroot
|
|
WorkingDirectory=/
|
|
ExecStart=/bin/kdump-error-handler.sh
|
|
ExecStopPost=-/bin/rm -f -- /.console_lock
|
|
Type=oneshot
|
|
StandardInput=tty-force
|
|
StandardOutput=inherit
|
|
StandardError=inherit
|
|
KillMode=process
|
|
IgnoreSIGPIPE=no
|
|
TasksMax=infinity
|
|
|
|
# Bash ignores SIGTERM, so we send SIGHUP instead, to ensure that bash
|
|
# terminates cleanly.
|
|
KillSignal=SIGHUP
|