From e686ccb4e9f9c9a3bd1c9ca4ea176b214ca0b42d Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Fri, 21 Jan 2022 16:02:50 -0500 Subject: [PATCH] Nonexistent /run/nologin should not fail compose If the file was not present, the command would fail and the compose would not proceed. This is currently blocking container base image generation for ELN. Signed-off-by: Stephen Gallagher --- fedora-container-base.ks | 2 +- fedora-eln-container-base.ks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora-container-base.ks b/fedora-container-base.ks index 8fec5d7..f6042ac 100644 --- a/fedora-container-base.ks +++ b/fedora-container-base.ks @@ -37,7 +37,7 @@ printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf # [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m # umount /run -rm /run/nologin # https://pagure.io/atomic-wg/issue/316 +rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316 # Final pruning rm -rfv /var/cache/* /var/log/* /tmp/* diff --git a/fedora-eln-container-base.ks b/fedora-eln-container-base.ks index 0f587ff..d529c7c 100644 --- a/fedora-eln-container-base.ks +++ b/fedora-eln-container-base.ks @@ -44,7 +44,7 @@ printf "tsflags=nodocs\n" >>/etc/dnf/dnf.conf # [/usr/lib/tmpfiles.d/systemd.conf:26] Failed to replace specifiers: /run/log/journal/%m # umount /run -rm /run/nologin # https://pagure.io/atomic-wg/issue/316 +rm -f /run/nologin # https://pagure.io/atomic-wg/issue/316 # Final pruning rm -rfv /var/cache/* /var/log/* /tmp/*