smwltr/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

Merge pull request #408 from jakllsch/netbsd-user-groups

Browse source 
add some NetBSD support in __user_groups
This commit is contained in:
Nico Schottelius 2015-10-20 15:26:44 +02:00
commit 7731dccbae
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cdist/conf/type/__user_groups/explorer/group
View file

@ -20,4 +20,4 @@
user="$(cat "$__object/parameter/user" 2>/dev/null || echo "$__object_id")" user="$(cat "$__object/parameter/user" 2>/dev/null || echo "$__object_id")"
(id --groups --name "$user" | tr ' ' '\n' | sort) 2>/dev/null || true (id -G -n "$user" | tr ' ' '\n' | sort) 2>/dev/null || true

7
cdist/conf/type/__user_groups/explorer/oldusermod
View file

@ -18,4 +18,11 @@
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
# #
os="$($__explorer/os)"
if [ "$os" = "netbsd" ]; then
echo netbsd
exit
fi
usermod --help | grep -q -- '-A group' && echo true || echo false usermod --help | grep -q -- '-A group' && echo true || echo false

8
cdist/conf/type/__user_groups/gencode-remote
View file

@ -21,8 +21,14 @@
user="$(cat "$__object/parameter/user" 2>/dev/null || echo "$__object_id")" user="$(cat "$__object/parameter/user" 2>/dev/null || echo "$__object_id")"
state_should="$(cat "$__object/parameter/state")" state_should="$(cat "$__object/parameter/state")"
oldusermod="$(cat "$__object/explorer/oldusermod")" oldusermod="$(cat "$__object/explorer/oldusermod")"
os=$(cat "$__global/explorer/os")
if [ "$oldusermod" = "true" ]; then if [ "$os" = "netbsd" ]; then
# NetBSD does not have a command to remove a user from a group
oldusermod="true"
addparam="-G"
delparam=";;#"
elif [ "$oldusermod" = "true" ]; then
addparam="-A" addparam="-A"
delparam="-R" delparam="-R"
else else