Fix issue 942:[PCM] CN IP loss after 12 hours due to the dhcp.lease t…

…imeout value 43200
xcat2 · Apr 25, 2016 · 52061dd · 52061dd
1 parent 40542f6
commit 52061dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/xCAT-server/share/xcat/install/scripts/post.rhels7 b/xCAT-server/share/xcat/install/scripts/post.rhels7
@@ -20,3 +20,11 @@ do
   #nic name change during the install and first_reboot
   sed -i '/HWADDR/d' $i
 done
+
+# NetworkManager will conflict with the configuring xcat do later in postboot script, so disable it in postscript 
+
+# There are 2 other service related to NetworkManager: NetworkManager-dispatcher and NetworkManager-wait-online
+# Both of them are triggered by NetworkManager, so just disable NetworkManager here
+if [ -f "/usr/lib/systemd/system/NetworkManager.service" ]; then
+    systemctl disable NetworkManager
+fi
diff --git a/xCAT/postscripts/xcatinstallpost b/xCAT/postscripts/xcatinstallpost
@@ -99,13 +99,6 @@ fi
 " >> /xcatpost/mypostscript.post
 fi
 
-stopservice NetworkManager
-stopservice NetworkManager-dispatcher
-stopservice NetworkManager-wait-online
-
-disableservice NetworkManager
-disableservice NetworkManager-dispatcher 
-disableservice NetworkManager-wait-online
 chmod +x /xcatpost/mypostscript.post
 if [ -x /xcatpost/mypostscript.post ];then
    msgutil_r "$MASTER_IP" "info" "running /xcatpost/mypostscript.post" "/var/log/xcat/xcat.log"