From 6af7eadc89fde159dea6ad94903dda6d83b2c324 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 2 Sep 2013 11:21:19 +0200 Subject: [PATCH] add --shell to __cdist Signed-off-by: Nico Schottelius --- cdist/conf/type/__cdist/manifest | 10 ++++++++-- cdist/conf/type/__cdist/parameter/optional | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cdist/conf/type/__cdist/manifest b/cdist/conf/type/__cdist/manifest index aeee415a..44d62f6c 100755 --- a/cdist/conf/type/__cdist/manifest +++ b/cdist/conf/type/__cdist/manifest @@ -21,6 +21,12 @@ directory="$__object_id" +if [ -f "$__object/parameter/shell" ]; then + shell="--shell $(cat "$__object/parameter/shell")" +else + shell="" +fi + if [ -f "$__object/parameter/username" ]; then username="$(cat "$__object/parameter/username")" else @@ -43,9 +49,9 @@ fi # out of it home=/home/$username -__user "$username" --home "$home" +__user "$username" --home "$home" $shell -require="__username/$user" __directory "$home" +require="__user/$username" __directory "$home" \ --owner "$username" require="__user/$username __directory/$home" __git "$directory" \ diff --git a/cdist/conf/type/__cdist/parameter/optional b/cdist/conf/type/__cdist/parameter/optional index d6582730..a5f14343 100644 --- a/cdist/conf/type/__cdist/parameter/optional +++ b/cdist/conf/type/__cdist/parameter/optional @@ -1,3 +1,4 @@ branch source username +shell