2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-02 19:40:10 +00:00

Merge pull request #1087 from immarvin/onsles12otherpkgs

fix issue#929@github,service network restart in <post-install scripts》 might break the service dependecy and will cause conflict between  YaST2-Second-Stage.service and xcatpostinit1 services
This commit is contained in:
Xiaopeng Wang 2016-05-11 22:18:23 +08:00
commit f01d209438

View File

@ -421,6 +421,19 @@ updateflag.awk $MASTER 3002
cd /
# fix the issue#929@github, the "service network restart" in <sles post scripts>
# 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