diff --git a/conf/type/__pf_ruleset/explorer/cksum b/conf/type/__pf_ruleset/explorer/cksum index 372e9193..ce188ba0 100755 --- a/conf/type/__pf_ruleset/explorer/cksum +++ b/conf/type/__pf_ruleset/explorer/cksum @@ -33,7 +33,7 @@ TMP="$(grep '^pf_rules=' ${RC} | cut -d= -f2 | sed 's/"//g')" PFCONF="${TMP:-"/etc/pf.conf"}" if [ -f "${PFCONF}" ]; then # The pf config file exists, find its cksum. - cksum -o 1 ${PFCONF} | cut -d= -f2 | sed 's/ //g' + cksum -o 1 ${PFCONF} | cut -d= -f2 | awk '{print $1}' else # the pf config file doesn't exist echo NOTEXIST fi diff --git a/conf/type/__pf_ruleset/gencode-local b/conf/type/__pf_ruleset/gencode-local index 7c2f877e..b1ee6a14 100644 --- a/conf/type/__pf_ruleset/gencode-local +++ b/conf/type/__pf_ruleset/gencode-local @@ -45,13 +45,13 @@ cksum=$(cat "$__object/explorer/cksum") cat <&2 @@ -66,9 +66,8 @@ if [ ! "${cksum}" = "NOTEXIST" ]; then else # File just doesn't exist yet $__remote_copy "${source}" "$__target_host:${rcvar}.new" fi - -if [ -n "${testscript}" ]; then - $__remote_copy "${testscript}" "$__target_host:${rcvar}.test" -fi EOF +# Debug +#exec +x +