From 11e799c1bbf17a4427314b81da15a5a7d67b9805 Mon Sep 17 00:00:00 2001 From: "Guilherme G. Piccoli" Date: Wed, 23 Nov 2022 18:17:20 -0300 Subject: [PATCH] kdump/systemd: Drop the systemd loader appoach Currently we have a loader script, that just calls the dump saving script and exits successfully. This was meant to prevent potential boot stalls due to systemd delays, but it proved to be just unnecessary...so, let's drop it here. Signed-off-by: Guilherme G. Piccoli --- Makefile | 1 - kdump-steamos.service | 2 +- submitter-load.sh | 12 ------------ 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 submitter-load.sh diff --git a/Makefile b/Makefile index b46db40..a0f1061 100644 --- a/Makefile +++ b/Makefile @@ -20,5 +20,4 @@ install: all install -D -m0644 README.md $(DESTDIR)$(dracutmodulesdir)/55kdump/README install -D -m0755 kdump-load.sh $(DESTDIR)$(libdir)/kdump/kdump-load.sh install -D -m0755 submit-report.sh $(DESTDIR)$(libdir)/kdump/submit-report.sh - install -D -m0755 submitter-load.sh $(DESTDIR)$(libdir)/kdump/submitter-load.sh install -D -m0644 kdump.conf $(DESTDIR)$(sharedir)/kdump/kdump.conf diff --git a/kdump-steamos.service b/kdump-steamos.service index 0ea894c..55745f1 100644 --- a/kdump-steamos.service +++ b/kdump-steamos.service @@ -10,7 +10,7 @@ Description=SteamOS kdump loader boot-time service Type=oneshot StandardOutput=journal ExecStartPre=/usr/lib/kdump/kdump-load.sh -ExecStart=/usr/lib/kdump/submitter-load.sh +ExecStart=/usr/lib/kdump/submit-report.sh RemainAfterExit=yes [Install] diff --git a/submitter-load.sh b/submitter-load.sh deleted file mode 100644 index 364ee60..0000000 --- a/submitter-load.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# SPDX-License-Identifier: LGPL-2.1+ -# -# Copyright (c) 2022 Valve. -# -# This is the systemd loader for the SteamOS kdump log submitter; -# it's invoked by systemd, basically it just loads a detached -# process and exits successfuly, in order to prevent boot hangs. - -/usr/lib/kdump/submit-report.sh & disown -exit 0