diff options
author | Dominick Grift <dominick.grift@defensec.nl> | 2022-05-01 19:54:04 +0200 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-05-03 20:32:38 +0100 |
commit | 9282cb0be06c103b229d5f4555c7a2b0448f58fe (patch) | |
tree | ba560fa058044459429ad07954d8823fe18a87fd /package | |
parent | dc71658a802b72c5413f04174bf317014380ebd3 (diff) | |
download | upstream-9282cb0be06c103b229d5f4555c7a2b0448f58fe.tar.gz upstream-9282cb0be06c103b229d5f4555c7a2b0448f58fe.tar.bz2 upstream-9282cb0be06c103b229d5f4555c7a2b0448f58fe.zip |
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 <daniel@makrotopia.org>
[move restorecon inside lock]
Signed-off-by: Dominick Grift <dominick.grift@defensec.nl>
(cherry picked from commit 5109bd164c8f2273329483f990188fb36cf3ad68)
Diffstat (limited to 'package')
-rw-r--r-- | package/base-files/files/lib/functions.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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 } |