Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add FreeBSD support #82

Merged
merged 5 commits into from Jul 9, 2012
Merged

Add FreeBSD support #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6bd529
Add FreeBSD support
Jun 20, 2012
2aee33f
Merge branch 'master' into __group
Jun 22, 2012
946d2b9
Change order of checks
Jun 25, 2012
fbdbbdd
Align messages for "password" parameter
Jun 25, 2012
04f4a5a
Merge branch 'master' into __group
Jun 25, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions conf/type/__group/explorer/gshadow
View file
Open in desktop
Expand Up @@ -23,6 +23,12 @@

name=$__object_id
os_version="$($__explorer/os_version)"
os="$($__explorer/os)"

if [ "$os" = "freebsd" ]; then
echo "FreeBSD does not have getent gshadow"
exit 0
fi

case "$os_version" in
"Red Hat Enterprise Linux Server release "[45]*|"CentOS release "[45]*)
Expand Down
50 changes: 44 additions & 6 deletions conf/type/__group/gencode-remote
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@

name="$__object_id"
os_version="$(cat "$__global/explorer/os_version")"
os="$(cat "$__global/explorer/os")"

cd "$__object/parameter"
if grep -q "^${name}:" "$__object/explorer/group"; then
Expand All @@ -35,14 +36,18 @@ if grep -q "^${name}:" "$__object/explorer/group"; then

case "$property" in
password)
current_value="$(awk -F: '{ print $2 }' < "$__object/explorer/gshadow")"
if [ "$os" = "freebsd" ]; then
echo "group/$name: FreeBSD doesn't support password modification" >&2
exit 1
fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe move the check before the current_value line, so current_value is filled for nothing => avoid possible mistakes

case "$os_version" in
"Red Hat Enterprise Linux Server release "[45]*|"CentOS release "[45]*)
# TODO: Use gpasswd? Need to fix gshadow explorer first.
echo "group/$name: '$os_version' groupmod does not support password modification" >&2
exit 1
;;
esac
current_value="$(awk -F: '{ print $2 }' < "$__object/explorer/gshadow")"
;;
gid)
# set to -g to support older redhat/centos
Expand All @@ -57,15 +62,48 @@ if grep -q "^${name}:" "$__object/explorer/group"; then
done

if [ $# -gt 0 ]; then
echo groupmod "$@" "$name"
else
true
case $os in
freebsd)
echo pw group mod "$@" "$name"
;;
*)
echo groupmod "$@" "$name"
;;
esac
fi
else
for property in $(ls .); do
new_value="$(cat "$property")"
set -- "$@" "--$property" \"$new_value\"
if [ "$os" = "freebsd" ]; then
case $property in
gid)
proparg="-g"
;;
password)
echo "group/$name: FreeBSD doesn't support password setting" >&2
exit 1
;;
*)
# The type has been updated to support more properties than it knows how to handle for FreeBSD
# tell the user about this.
echo "Currently unknown property: $property" >&2
exit 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The property is not really unknown, but more unsupported on fbsd - maybe align the error message with the one above (unsupported on fbsd)

;;
esac
else
proparg="--$property"
fi

set -- "$@" "$proparg" \"$new_value\"
done

echo groupadd "$@" "$name"
case $os in
freebsd)
echo pw group add "$@" "$name"
;;
*)
echo groupadd "$@" "$name"
;;
esac
fi