From 806c697a56dfe64b30f70fce7c4ea302798f3c03 Mon Sep 17 00:00:00 2001 From: immarvin Date: Wed, 11 May 2016 04:44:49 -0400 Subject: [PATCH] fix issue#929@github,service network restart in might break the service dependecy and will cause conflict between YaST2-Second-Stage.service and xcatpostinit1 services --- xCAT-server/share/xcat/install/scripts/post.xcat | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/xCAT-server/share/xcat/install/scripts/post.xcat b/xCAT-server/share/xcat/install/scripts/post.xcat index 6fdecb425..9c170c790 100755 --- a/xCAT-server/share/xcat/install/scripts/post.xcat +++ b/xCAT-server/share/xcat/install/scripts/post.xcat @@ -421,6 +421,19 @@ updateflag.awk $MASTER 3002 cd / +# fix the issue#929@github, the "service network restart" in +# makes the 'network' service in start status, then it causes the +# services YaST2-Second-Stage.service and xcatpostinit1 services to be run in parallel. +# But the YaST2-Second-Stage.service calls the Yast2 which conflics with the zypper +# which is called in xcatpostinit1->otherpkgs. +# The correct services start order is 'YaST2-Second-Stage.service'->'network'->'xcatpostinit1' in serial. +# To skip the conflict, the network service should be stoped in the yast first stage. Then base on the service +# dependency, the service start order will be 'YaST2-Second-Stage.service'->'network'->'xcatpostinit1' in serial. +# Then the Yast2 will be stopped before running the zypper in otherpkgs. +if [[ $OSVER != sles11* ]]; then + service network stop +fi + if [ "$XCATDEBUGMODE" = "1" ] || [ "$XCATDEBUGMODE" = "2" ]; then set +x fi