summaryrefslogtreecommitdiffstats
path: root/extras/hook-scripts/create/post
diff options
context:
space:
mode:
authorMilan Zink <mzink@redhat.com>2018-02-05 15:04:37 +0100
committerShyamsundar Ranganathan <srangana@redhat.com>2019-05-08 13:56:20 +0000
commit2aa9898720e3be2a203bec960103afc2558ddff6 (patch)
treedbfd563869b06278d86aec8830e615a1b9ebd6ec /extras/hook-scripts/create/post
parentbf69fa4727f2b4432d7d54312bc0177cbcf44936 (diff)
extras/hooks: syntactical errors in SELinux hooks, scipt logic improved
Fixes: bz#1701818 Change-Id: Ia5fa1df81bbaec3a84653d136a331c76b457f42c Signed-off-by: Milan Zink <zeten30@gmail.com> (cherry picked from commit 1ad201a9fd6748d7ef49fb073fcfe8c6858d557d)
Diffstat (limited to 'extras/hook-scripts/create/post')
-rwxr-xr-xextras/hook-scripts/create/post/S10selinux-label-brick.sh13
1 files changed, 8 insertions, 5 deletions
diff --git a/extras/hook-scripts/create/post/S10selinux-label-brick.sh b/extras/hook-scripts/create/post/S10selinux-label-brick.sh
index de242d20af4..f9b4b1a57e3 100755
--- a/extras/hook-scripts/create/post/S10selinux-label-brick.sh
+++ b/extras/hook-scripts/create/post/S10selinux-label-brick.sh
@@ -34,18 +34,21 @@ parse_args () {
set_brick_labels()
{
- volname=${1}
+ volname="${1}"
# grab the path for each local brick
- brickpath="/var/lib/glusterd/vols/${volname}/bricks/*"
- brickdirs=$(grep '^path=' "${brickpath}" | cut -d= -f 2 | sort -u)
+ brickpath="/var/lib/glusterd/vols/${volname}/bricks/"
+ brickdirs=$(
+ find "${brickpath}" -type f -exec grep '^path=' {} \; | \
+ cut -d= -f 2 | \
+ sort -u
+ )
for b in ${brickdirs}; do
# Add a file context for each brick path and associate with the
# glusterd_brick_t SELinux type.
- pattern="${b}\(/.*\)?"
+ pattern="${b}(/.*)?"
semanage fcontext --add -t glusterd_brick_t -r s0 "${pattern}"
-
# Set the labels on the new brick path.
restorecon -R "${b}"
done