From 19e53e8ad1a6889d020c6029d2d34273dacdc750 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 5 May 2008 14:46:37 -0400 Subject: Always restart dhcp seperate from dns. --- triggers/restart-services.trigger | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'triggers/restart-services.trigger') diff --git a/triggers/restart-services.trigger b/triggers/restart-services.trigger index bc7c36e..d586f46 100644 --- a/triggers/restart-services.trigger +++ b/triggers/restart-services.trigger @@ -4,6 +4,8 @@ import cobbler.api as capi import os import sys +#!/usr/bin/python + bootapi = capi.BootAPI() settings = bootapi.settings() manage_dhcp = str(settings.manage_dhcp).lower() @@ -12,14 +14,10 @@ manage_dns = str(settings.manage_dns).lower() omapi_enabled = settings.omapi_enabled omapi_port = settings.omapi_port - - -# We're just going to restart DHCPD if using ISC and if not using OMAPI at all rc = 0 if manage_dhcp != "0": if manage_dhcp_mode == "isc": if not omapi_enabled: - if not omapi_port: rc = os.system("/sbin/service dhcpd restart") elif manage_dhcp_mode == "dnsmasq": rc = os.system("/sbin/service dnsmasq restart") @@ -27,9 +25,6 @@ if manage_dhcp != "0": print "- error: unknown DHCP engine: %s" % manage_dhcp_mode rc = 411 -if rc != 0: - sys.exit(rc) - if manage_dns != "0": rc = os.system("/sbin/service named restart") -- cgit