From: Dominick Grift Date: Sun, 1 May 2022 17:54:04 +0000 (+0200) Subject: base-files: address sed in-place without SELinux awareness X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5109bd164c8f2273329483f990188fb36cf3ad68;p=openwrt%2Fstaging%2Fnbd.git base-files: address sed in-place without SELinux awareness sed(1) in busybox does not support this functionality: https://git.savannah.gnu.org/cgit/sed.git/tree/sed/execute.c#n598 This causes /etc/group to become mislabeled when a package requests that a uid/gid be added on OpenWrt with SELinux Signed-off-by: Daniel Golle [move restorecon inside lock] Signed-off-by: Dominick Grift --- diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index ee0c33845c..9db0871d6c 100644 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -386,6 +386,7 @@ 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 [ -n "$IPKG_INSTROOT" ] || lock -u /var/lock/passwd }