diff --git a/01-dnssec-trigger-hook b/01-dnssec-trigger-hook index f6c7d2a..6bc6a19 100755 --- a/01-dnssec-trigger-hook +++ b/01-dnssec-trigger-hook @@ -33,8 +33,17 @@ esac ######################### # get global nameservers -if [ -x "`which $nmcli 2>&1`" ]; then - global_nameservers="`$nmcli -f IP4,IP6 dev list | fgrep 'DNS' | awk '{print $2;}'`" +# try to get nmcli version +NMCLI_VER="`nmcli -v 2> /dev/null | sed 's/.*version \([0-9]\)\.\([0-9]\)\.\([0-9]\)\.\([0-9]\).*/\1\2\3\4/'`" +# if nmcli exists +if [ -n $NMCLI_VER ]; then + # if the version is greater or equal 0.9.9.0 + if [ $NMCLI_VER -ge 0990 ]; then + global_nameservers="`nmcli -f IP4,IP6 dev show | fgrep 'DNS' | awk '{print $2;}'`" + else + global_nameservers="`nmcli -f IP4,IP6 dev list | fgrep 'DNS' | awk '{print $2;}'`" + fi +# nmcli does not exist else global_nameservers="`nm-tool | grep 'DNS:' | awk '{print $2;}'`" fi diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec index 767e29f..37b198b 100644 --- a/dnssec-trigger.spec +++ b/dnssec-trigger.spec @@ -1,7 +1,7 @@ Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving Name: dnssec-trigger Version: 0.11 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/ Source: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz @@ -130,6 +130,9 @@ fi /bin/systemctl daemon-reload >/dev/null 2>&1 || : %changelog +* Tue Nov 12 2013 Tomas Hozza - 0.11-14 +- Fix NM dispatcher script to work with NM >= 0.9.9.0 (#1029571) + * Mon Aug 26 2013 Tomas Hozza - 0.11-13 - Fix errors found by static analysis of source