[openwrt/openwrt] base-files: simplify restorecon logic

LEDE Commits lede-commits at lists.infradead.org
Tue May 3 12:33:50 PDT 2022


dangole pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/0dc3ecf0da1c609b44a180555a0aac40bea79c7b

commit 0dc3ecf0da1c609b44a180555a0aac40bea79c7b
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon May 2 21:07:16 2022 +0100

    base-files: simplify restorecon logic
    
    Remove forgotten redundant selinuxenabled call and skip the whole
    thing in case $IPKG_INSTROOT is set as labels are anyway applied only
    later on in fakeroot when squashfs is created.
    
    Fixes: 6d7272852e ("base-files: add missing $IPKG_INSTROOT to restorecon call")
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
    (cherry picked from commit 7b07c3cff57f057d6780d34adeb23c06123732db)
---
 package/base-files/files/lib/functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index da2dd5b346..4b1b838572 100644
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -386,8 +386,8 @@ 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
-	if [ -x /usr/sbin/selinuxenabled ] && selinuxenabled; then
-		selinuxenabled 2>/dev/null && restorecon ${IPKG_INSTROOT}/etc/group
+	if [ -z "$IPKG_INSTROOT" ] && [ -x /usr/sbin/selinuxenabled ] && selinuxenabled; then
+		restorecon /etc/group
 	fi
 	[ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd
 }




More information about the lede-commits mailing list