mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-10-21 23:28:19 +00:00
Merge pull request #7894 from VersatusHPC/fix/openeuler-provisioning
fix(xCAT-server): an openEuler node reinstalls for ever instead of booting
This commit is contained in:
@@ -63,7 +63,7 @@ sleep "$RAND"
|
||||
if ! type openssl >/dev/null 2>&1
|
||||
then
|
||||
msgutil_r "$MASTER_IP" "error" "/usr/bin/openssl does not exist, halt ..." "/var/log/xcat/xcat.log" "$log_label"
|
||||
/tmp/updateflag "$MASTER" "$XCATIPORT" "installstatus failed"
|
||||
/tmp/updateflag "$MASTER_IP" "$XCATIPORT" "installstatus failed"
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
@@ -107,7 +107,7 @@ msgutil_r "$MASTER_IP" "info" "trying to download postscripts from $MASTER_IP...
|
||||
if ! type curl >/dev/null 2>&1
|
||||
then
|
||||
msgutil_r "$MASTER_IP" "error" "Command curl not found, halt ..." "/var/log/xcat/xcat.log" "$log_label"
|
||||
/tmp/updateflag "$MASTER" "$XCATIPORT" "installstatus failed"
|
||||
/tmp/updateflag "$MASTER_IP" "$XCATIPORT" "installstatus failed"
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
@@ -143,7 +143,7 @@ download_recursive "http://$MASTER_IP:${HTTPPORT}$INSTALLDIR/postscripts/" "/xca
|
||||
if [ "$?" -ne "0" ]
|
||||
then
|
||||
msgutil_r "$MASTER_IP" "error" "failed to download postscripts from http://$MASTER_IP$INSTALLDIR/postscripts/, check /tmp/download.log on the node, halt ..." "/var/log/xcat/xcat.log" "$log_label"
|
||||
/tmp/updateflag "$MASTER" "$XCATIPORT" "installstatus failed"
|
||||
/tmp/updateflag "$MASTER_IP" "$XCATIPORT" "installstatus failed"
|
||||
sleep infinity
|
||||
fi
|
||||
|
||||
@@ -189,7 +189,7 @@ if [ ! -x /xcatpost/mypostscript ]; then
|
||||
# Stop if no getpostscript.awk to help the next bit
|
||||
if [ ! -x /xcatpost/getpostscript.awk ]; then
|
||||
msgutil_r "$MASTER_IP" "error" "/xcatpost/getpostscript.awk does not exist, halt ..." "/var/log/xcat/xcat.log" "$log_label"
|
||||
/tmp/updateflag "$MASTER" "$XCATIPORT" "installstatus failed"
|
||||
/tmp/updateflag "$MASTER_IP" "$XCATIPORT" "installstatus failed"
|
||||
sleep infinity
|
||||
fi
|
||||
/xcatpost/getpostscript.awk | egrep '<data>' | sed -e 's/<[^>]*>//g' | egrep -v '^ *$' | sed -e 's/^ *//' | sed -e 's/</</g' -e 's/>/>/g' -e 's/&/\&/g' -e 's/"/"/g' -e "s/'/'/g" >/xcatpost/mypostscript
|
||||
@@ -301,7 +301,7 @@ esac
|
||||
chmod 0755 /xcatpost/mypostscript
|
||||
if [ ! -x /xcatpost/mypostscript ]; then
|
||||
msgutil_r "$MASTER_IP" "error" "failed to generate mypostscript file, halt ..." "/var/log/xcat/xcat.log" "$log_label"
|
||||
/tmp/updateflag "$MASTER" "$XCATIPORT" "installstatus failed"
|
||||
/tmp/updateflag "$MASTER_IP" "$XCATIPORT" "installstatus failed"
|
||||
sleep infinity
|
||||
else
|
||||
case "$XCATDEBUGMODE" in
|
||||
@@ -454,7 +454,7 @@ esac
|
||||
|
||||
msgutil_r "$MASTER_IP" "info" "finished firstboot preparation, sending request to $MASTER:3002 for changing status..." "/var/log/xcat/xcat.log" "$log_label"
|
||||
# The following command should always be run to prevent infinite installation loops
|
||||
updateflag.awk "$MASTER" 3002
|
||||
updateflag.awk "$MASTER_IP" 3002
|
||||
|
||||
cd /
|
||||
|
||||
|
||||
Reference in New Issue
Block a user