projects
/
openwrt
/
staging
/
blocktrron.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9282cb0
)
base-files: add missing $IPKG_INSTROOT to restorecon call
author
Daniel Golle
<
[email protected]
>
Mon, 2 May 2022 18:58:56 +0000
(19:58 +0100)
committer
Daniel Golle
<
[email protected]
>
Tue, 3 May 2022 19:32:38 +0000
(20:32 +0100)
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 <
[email protected]
>
(cherry picked from commit
6d7272852e0b2634b2fa93a131ea8659ec87f079
)
package/base-files/files/lib/functions.sh
patch
|
blob
|
history
diff --git
a/package/base-files/files/lib/functions.sh
b/package/base-files/files/lib/functions.sh
index 9db0871d6ccbb5413c452c12a3864a780093c68e..da2dd5b34643688b863e4ff817d5d4508e733300 100644
(file)
--- 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
}