From 24a20072ff455792fc343a5ccaa96aed70ccaffd Mon Sep 17 00:00:00 2001
From: ligc <ligc@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 29 Jun 2012 03:14:32 +0000
Subject: [PATCH] fix for bug 3524402: run chkconfig dhcpd on in xcatconfig

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13195 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 5 ++++-
 xCAT-server/sbin/xcatconfig          | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 1a17fdd69..5634e7584 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -1443,7 +1443,10 @@ sub process_request
         else
         {
             system("/etc/init.d/dhcpd restart");
-            system("chkconfig dhcpd on");
+            # should not chkconfig dhcpd on every makedhcp invoation
+            # it is not appropriate and will cause problem for HAMN
+            # do it in xcatconfig instead
+            #system("chkconfig dhcpd on");
         }
     }
     flock($dhcplockfd,LOCK_UN);
diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index 0eff52ad0..ea66febcf 100755
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -396,6 +396,9 @@ if ($::INITIALINSTALL || $::FORCE)
      &makenetworks;
      &setuphttp;
 
+     # chkconfig dhcpd on
+     system("chkconfig dhcpd on");
+
      my $linux_note =
       "xCAT is now running, it is recommended to tabedit networks \nand set a dynamic ip address range on any networks where nodes \nare to be discovered. Then, run makedhcp -n to create a new dhcpd \nconfiguration file, and \/etc\/init.d\/dhcpd restart. Either examine sample \nconfiguration templates, or write your own, or specify a value per \nnode with nodeadd or tabedit.";
      xCAT::MsgUtils->message('I', $linux_note);