瀏覽代碼

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 <[email protected]>
Daniel Golle 3 年之前
父節點
當前提交
7b07c3cff5
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      package/base-files/files/lib/functions.sh

+ 2 - 2
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
 }