From 6cb08b17979c93a7cc086127786ee813b3775783 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 2 May 2022 19:58:56 +0100 Subject: [PATCH] base-files: add missing $IPKG_INSTROOT to restorecon call Update to overlooked v2 version of Dominick Grift's patch. Fixes: 5109bd164c ("base-files: address sed in-place without SELinux awareness") Signed-off-by: Daniel Golle (cherry picked from commit 6d7272852e0b2634b2fa93a131ea8659ec87f079) --- package/base-files/files/lib/functions.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 9db0871d6cc..da2dd5b3464 100644 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -386,7 +386,9 @@ group_add_user() { echo "$grp" | grep -q ":$" && delim="" [ -n "$IPKG_INSTROOT" ] || lock /var/lock/passwd sed -i "s/$grp/$grp$delim$2/g" ${IPKG_INSTROOT}/etc/group - selinuxenabled 2>/dev/null && restorecon /etc/group + if [ -x /usr/sbin/selinuxenabled ] && selinuxenabled; then + selinuxenabled 2>/dev/null && restorecon ${IPKG_INSTROOT}/etc/group + fi [ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd }