From 357634189e953189fed7d63e51435142ca659f96 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 24 May 2024 17:18:38 -0700 Subject: [PATCH] chore: Move default timeout config to /etc for easy customization --- Containerfile | 2 -- .../desktop/shared/usr/etc/systemd/system.conf.d/timeout.conf | 1 + .../desktop/shared/usr/etc/systemd/user.conf.d/timeout.conf | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 system_files/desktop/shared/usr/etc/systemd/system.conf.d/timeout.conf create mode 100644 system_files/desktop/shared/usr/etc/systemd/user.conf.d/timeout.conf diff --git a/Containerfile b/Containerfile index a9587181..437e4250 100644 --- a/Containerfile +++ b/Containerfile @@ -602,8 +602,6 @@ RUN /usr/libexec/containerbuild/build-initramfs && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo && \ - sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /usr/lib/systemd/user.conf && \ - sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /usr/lib/systemd/system.conf && \ mkdir -p /usr/etc/flatpak/remotes.d && \ curl -Lo /usr/etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo && \ systemctl enable brew-dir-fix.service && \ diff --git a/system_files/desktop/shared/usr/etc/systemd/system.conf.d/timeout.conf b/system_files/desktop/shared/usr/etc/systemd/system.conf.d/timeout.conf new file mode 100644 index 00000000..1bdf6e82 --- /dev/null +++ b/system_files/desktop/shared/usr/etc/systemd/system.conf.d/timeout.conf @@ -0,0 +1 @@ +DefaultTimeoutStopSec=15s diff --git a/system_files/desktop/shared/usr/etc/systemd/user.conf.d/timeout.conf b/system_files/desktop/shared/usr/etc/systemd/user.conf.d/timeout.conf new file mode 100644 index 00000000..1bdf6e82 --- /dev/null +++ b/system_files/desktop/shared/usr/etc/systemd/user.conf.d/timeout.conf @@ -0,0 +1 @@ +DefaultTimeoutStopSec=15s