fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix shell IPv6 testing (for -e).

Browse source
This commit is contained in:
Darko Poljak 2016-11-28 08:13:59 +01:00
parent 36244b8a11
commit ca424a34e6
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cdist/conf/type/__file/gencode-local
View file

@ -67,8 +67,7 @@ DONE
if [ "$upload_file" ]; then if [ "$upload_file" ]; then
echo upload >> "$__messages_out" echo upload >> "$__messages_out"
# IPv6 fix # IPv6 fix
echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$' if $(echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$')
if [ $? -eq 0 ]
then then
my_target_host="[${__target_host}]" my_target_host="[${__target_host}]"
else else

3
cdist/conf/type/__jail_freebsd10/gencode-local
View file

@ -44,8 +44,7 @@ basepresent="$(cat "$__object/explorer/basepresent")"
if [ "$state" = "present" ]; then if [ "$state" = "present" ]; then
if [ "$basepresent" = "NONE" ]; then if [ "$basepresent" = "NONE" ]; then
# IPv6 fix # IPv6 fix
echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$' if $(echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$')
if [ $? -eq 0 ]
then then
my_target_host="[${__target_host}]" my_target_host="[${__target_host}]"
else else

3
cdist/conf/type/__jail_freebsd9/gencode-local
View file

@ -40,8 +40,7 @@ basepresent="$(cat "$__object/explorer/basepresent")"
if [ "$state" = "present" ]; then if [ "$state" = "present" ]; then
if [ "$basepresent" = "NONE" ]; then if [ "$basepresent" = "NONE" ]; then
# IPv6 fix # IPv6 fix
echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$' if $(echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$')
if [ $? -eq 0 ]
then then
my_target_host="[${__target_host}]" my_target_host="[${__target_host}]"
else else

3
cdist/conf/type/__pf_ruleset/gencode-local
View file

@ -60,8 +60,7 @@ case $uname in
esac esac
# IPv6 fix # IPv6 fix
echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$' if $(echo "${__target_host}" | grep -q -E '^[0-9a-fA-F:]+$')
if [ $? -eq 0 ]
then then
my_target_host="[${__target_host}]" my_target_host="[${__target_host}]"
else else