xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

Support RHEL7->RHEL8 diskful installation (#5491)

Browse Source 
* Make curl "fail" on >= 400 reponse codes with --fail

* Minor fix of post.xcat.ng

* Hack for RHEL8 Alpha - make network active by default
This commit is contained in:
Gᴏɴɢ Jie 2018-08-29 17:25:32 +08:00 committed by yangsong
parent 522b5fcf37
commit d58f00ed5a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xCAT-server/share/xcat/install/scripts/post.rhels8
View File

@ -18,3 +18,6 @@ do
sed -i 's/ONBOOT=no/ONBOOT=yes/' "$i"
fi
done
# Dirty hack for RHEL8 Alpha
chkconfig network on

8
xCAT-server/share/xcat/install/scripts/post.xcat.ng
View File

@ -58,7 +58,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" "$XCATIPORT" "installstatus failed"
sleep infinity
fi
@ -119,11 +119,11 @@ function download_recursive()
[ "$?" -ne "0" ] && return 1
;;
*)
curl --retry 20 --max-time 60 "${url}/${f}" -o "${dest_dir}/${f}"
curl --fail --retry 20 --max-time 60 "${url}/${f}" -o "${dest_dir}/${f}"
[ "$?" -ne "0" ] && return 1
;;
esac
done < <(curl --retry 20 --max-time 60 "${url}/" | grep -o '<a href="\([^"]*\)">\1</a>' | cut -d '"' -f 2)
done < <(curl --fail --retry 20 --max-time 60 "${url}/" | grep -o '<a href="\([^"]*\)">\1</a>' | cut -d '"' -f 2)
return 0
}
@ -143,7 +143,7 @@ export NODE="#TABLE:nodelist:THISNODE:node#"
msgutil_r "$MASTER_IP" "info" "trying to get mypostscript from $MASTER_IP..." "/var/log/xcat/xcat.log" "$log_label"
curl --retry 20 --max-time 60 "http://$MASTER_IP$TFTPDIR/mypostscripts/mypostscript.$NODE" -o "/xcatpost/mypostscript.$NODE" 2> /tmp/download.log
curl --fail --retry 20 --max-time 60 "http://$MASTER_IP$TFTPDIR/mypostscripts/mypostscript.$NODE" -o "/xcatpost/mypostscript.$NODE" 2> /tmp/download.log
if [ "$?" = "0" ]
then
case "$XCATDEBUGMODE" in