diff --git a/cdist/conf/type/__ipset/explorer/content b/cdist/conf/type/__ipset/explorer/content index 54731da6..87f6b517 100755 --- a/cdist/conf/type/__ipset/explorer/content +++ b/cdist/conf/type/__ipset/explorer/content @@ -19,7 +19,7 @@ # name="$__object_id" -if ipset -t list | grep -qP "Name: $name"; then +if ipset -t list | grep -qFx "Name: $name"; then ipset list "$name" | sed '0,/^Members:/d' else echo "x_missing_x" diff --git a/cdist/conf/type/__ipset/explorer/type b/cdist/conf/type/__ipset/explorer/type index 5b943c86..9413cdad 100755 --- a/cdist/conf/type/__ipset/explorer/type +++ b/cdist/conf/type/__ipset/explorer/type @@ -19,8 +19,8 @@ # name="$__object_id" -if ipset -t list | grep -qP "Name: $name"; then - ipset -t list "$name" | grep -P "^Type: " | awk '{print $2}' +if ipset -t list | grep -qFx "Name: $name"; then + ipset -t list "$name" | grep "^Type: " | awk '{print $2}' else echo "x_missing_x" fi diff --git a/cdist/conf/type/__ipset/files/ipsets-save b/cdist/conf/type/__ipset/files/ipsets-save index 2aed28ec..9f5a9f3a 100755 --- a/cdist/conf/type/__ipset/files/ipsets-save +++ b/cdist/conf/type/__ipset/files/ipsets-save @@ -22,7 +22,7 @@ mkdir -p /etc/ipset.d/ if [ -n "$1" ]; then ipset save "$1" > "/etc/ipset.d/${1}.saved" else -ipset -t list | grep -P "^Name:" | awk '{print $2}' | while read s; do +ipset -t list | grep "^Name:" | awk '{print $2}' | while read s; do ipset save $s > /etc/ipset.d/$s.saved done fi diff --git a/cdist/conf/type/__ipset/gencode-remote b/cdist/conf/type/__ipset/gencode-remote index 947bedfe..38437a6c 100755 --- a/cdist/conf/type/__ipset/gencode-remote +++ b/cdist/conf/type/__ipset/gencode-remote @@ -54,7 +54,7 @@ esac if [ "$state_should" = "present" ]; then if [ -f "$p/add" ]; then while read -r value; do - if ! grep -q "$value" "$e/content"; then + if ! grep -qFx "$value" "$e/content"; then echo "ipset -! add $name $value" needToSave=1 fi @@ -63,7 +63,7 @@ if [ "$state_should" = "present" ]; then if [ -f "$p/del" ]; then while read -r value; do - if grep -q "$value" "$e/content"; then + if grep -qFx "$value" "$e/content"; then echo "ipset -! del $name $value" needToSave=1 fi