From 108e46abee03eaca789eb43393aaccf9f699bf7a Mon Sep 17 00:00:00 2001 From: Ander Punnar Date: Fri, 19 Apr 2019 15:04:18 +0300 Subject: [PATCH] __acl: fix removal in freebsd --- cdist/conf/type/__acl/gencode-remote | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cdist/conf/type/__acl/gencode-remote b/cdist/conf/type/__acl/gencode-remote index c9583520..a0f25a15 100755 --- a/cdist/conf/type/__acl/gencode-remote +++ b/cdist/conf/type/__acl/gencode-remote @@ -99,10 +99,15 @@ then then continue fi - no_bits="$( echo "$acl" | sed 's/:...$//' )" + if echo "$os" | grep -Eq 'macosx|freebsd' + then + remove="$acl" + else + remove="$( echo "$acl" | sed 's/:...$//' )" + fi - echo "$setfacl_exec -x \"$no_bits\" \"$acl_path\"" - echo "removed '$no_bits'" >> "$__messages_out" + echo "$setfacl_exec -x \"$remove\" \"$acl_path\"" + echo "removed '$remove'" >> "$__messages_out" done fi fi