33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
From 1cd3626354131eecbaea0ce16f04be34ad4dfbf9 Mon Sep 17 00:00:00 2001
|
|
From: David Tardon <dtardon@redhat.com>
|
|
Date: Fri, 11 Mar 2022 14:04:16 +0100
|
|
Subject: [PATCH] fix(dracut-initramfs-restore.sh): check if SELINUXTYPE is set
|
|
|
|
It can happen that SELINUXTYPE is not set, e.g., in Fedora/RHEL
|
|
installation images /etc/selinux/config is an empty file. That means
|
|
that setfiles fails, which makes dracut-initramfs-restore fail too
|
|
because it uses "set -x", which means that dracut-shutdown.service
|
|
fails. But, after commit 7ab1d00227cad6f1b86ba01fdc766769faebb031, a
|
|
failure of dracut-shutdown.service means that the final switch back into
|
|
initrd is skipped. Let's just add an additional sanity check to
|
|
workaround that.
|
|
|
|
Resolves: #2059552
|
|
---
|
|
dracut-initramfs-restore.sh | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh
|
|
index d97030a3..25cc881d 100644
|
|
--- a/dracut-initramfs-restore.sh
|
|
+++ b/dracut-initramfs-restore.sh
|
|
@@ -65,7 +65,7 @@ fi
|
|
|
|
if [ -e /etc/selinux/config -a -x /usr/sbin/setfiles ]; then
|
|
. /etc/selinux/config
|
|
- /usr/sbin/setfiles -v -r /run/initramfs /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts /run/initramfs > /dev/null
|
|
+ [ -n "${SELINUXTYPE}" ] && /usr/sbin/setfiles -v -r /run/initramfs /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts /run/initramfs > /dev/null
|
|
fi
|
|
|
|
exit 0
|