[PATCH 1/1] Fix config to disable restarting of dns-server

[mh]

From: Marcel Haerry <haerry(a)puzzle.ch&gt;

If you just "and" the string-variable it will always be true,
threfor we need to compare it as a string.

Signed-off-by: Marcel Haerry <haerry(a)puzzle.ch&gt;
---
 triggers/restart-services.trigger |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/triggers/restart-services.trigger b/triggers/restart-services.trigger
index 6eac017..38e94e7 100644
--- a/triggers/restart-services.trigger
+++ b/triggers/restart-services.trigger
@@ -33,7 +33,7 @@ if manage_dhcp != "0":
         print "- error: unknown DHCP engine: %s" % bootapi.dhcp.what()
         rc = 411
 
-if manage_dns != "0" and restart_dns:
+if manage_dns != "0" and restart_dns != "0":
     if bootapi.dns.what() == "bind":
         rc = os.system("/sbin/service named restart")
     elif bootapi.dns.what() == "dnsmasq" and not has_restarted_dnsmasq:
-- 
1.5.5.1

[Michael DeHaan]

haerry+et(a)puzzle.ch wrote:
>  From: Marcel Haerry <haerry(a)puzzle.ch&gt;
>
>  If you just "and" the string-variable it will always be true,
>  threfor we need to compare it as a string.
>
>  Signed-off-by: Marcel Haerry <haerry(a)puzzle.ch&gt;
>  ---
>   triggers/restart-services.trigger |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
>  diff --git a/triggers/restart-services.trigger b/triggers/restart-services.trigger
>  index 6eac017..38e94e7 100644
>  --- a/triggers/restart-services.trigger
>  +++ b/triggers/restart-services.trigger
>  @@ -33,7 +33,7 @@ if manage_dhcp != "0":
>           print "- error: unknown DHCP engine: %s" % bootapi.dhcp.what()
>           rc = 411
>   
>  -if manage_dns != "0" and restart_dns:
>  +if manage_dns != "0" and restart_dns != "0":
>       if bootapi.dns.what() == "bind":
>           rc = os.system("/sbin/service named restart")
>       elif bootapi.dns.what() == "dnsmasq" and not has_restarted_dnsmasq:
>     
Applied to devel and stable, thanks!

--Michael