From 52061dd6623a8bf81dd9145653759428c1b89fd5 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Mon, 25 Apr 2016 03:08:59 -0400 Subject: [PATCH] Fix issue 942:[PCM] CN IP loss after 12 hours due to the dhcp.lease timeout value 43200 --- xCAT-server/share/xcat/install/scripts/post.rhels7 | 8 ++++++++ xCAT/postscripts/xcatinstallpost | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/post.rhels7 b/xCAT-server/share/xcat/install/scripts/post.rhels7 index b34d7d012..3b36dfefe 100644 --- 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 index 0eee2be6a..83d9a8eb9 100755 --- 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"