autodedtection of old usermod implementations ...
This commit is contained in:
parent
56168cda65
commit
e89ca14e66
2 changed files with 25 additions and 8 deletions
21
cdist/conf/type/__user_groups/explorer/oldusermod
Normal file
21
cdist/conf/type/__user_groups/explorer/oldusermod
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# 2015 Heule Daniel (hda at sfs.biz)
|
||||||
|
#
|
||||||
|
# This file is part of cdist.
|
||||||
|
#
|
||||||
|
# cdist is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# cdist is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
|
||||||
|
usermod --help | grep -q -- '-A group' && echo true || echo false
|
|
@ -1,7 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
|
# 2012 Steven Armstrong (steven-cdist at armstrong.cc)
|
||||||
# 2015 Daniel Heule ( hda at sfs.biz )
|
|
||||||
#
|
#
|
||||||
# This file is part of cdist.
|
# This file is part of cdist.
|
||||||
#
|
#
|
||||||
|
@ -21,20 +20,17 @@
|
||||||
|
|
||||||
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")"
|
||||||
|
|
||||||
os_version="$(cat "$__global/explorer/os_version")"
|
if [ "$oldusermod" = "true" ]; then
|
||||||
case "$os_version" in
|
|
||||||
SUSE\ Linux\ Enterprise\ Server\ 11*VERSION\ =\ 11*)
|
|
||||||
old=yes
|
old=yes
|
||||||
addparam="-A"
|
addparam="-A"
|
||||||
delparam="-R"
|
delparam="-R"
|
||||||
;;
|
else
|
||||||
*)
|
|
||||||
old=no
|
old=no
|
||||||
addparam="-a"
|
addparam="-a"
|
||||||
delparam="-d"
|
delparam="-d"
|
||||||
;;
|
fi
|
||||||
esac
|
|
||||||
|
|
||||||
mkdir "$__object/files"
|
mkdir "$__object/files"
|
||||||
# file has to be sorted for comparison with `comm`
|
# file has to be sorted for comparison with `comm`
|
||||||
|
|
Loading…
Reference in a new issue