From 607e2bd385a49334ee700a360a9fd0dda7d58618 Mon Sep 17 00:00:00 2001
From: ligc <liguangc@cn.ibm.com>
Date: Fri, 28 Nov 2014 10:13:34 +0800
Subject: [PATCH] fix for bug 4399: on Ubuntu, disable isc-dhcp-server in
 upstart to avoid two dhcp server daemons, let xcat totally mangae dhcp server

---
 xCAT-server/sbin/xcatconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index 48d88e15d..4440a7753 100755
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -223,7 +223,21 @@ else
 chomp $::arch;
 chomp $::root;
 
+if ($::INITIALINSTALL || $::FORCE || $::UPDATEINSTALL)
+{
+    # Ubuntu uses upstart to manage dhcp server,
+    # xCAT does not support upstart for now,
+    # disable dhcp server in upstart and let xCAT totally manage dhcp server
+    if ( -e "/etc/debian_version" )
+    {
+        # Try to stop isc-dhcp-server started by upstart
+        my $cmd = "stop isc-dhcp-server";
+        xCAT::Utils->runcmd("$cmd", -1);
 
+        # Disable isc-dhcp-server in upstart
+        `echo manual > /etc/init/isc-dhcp-server.override`;
+    }
+}
 
 #
 # Generate ssh host keys for the nodes