From 751bce24801e7f0cf66717f86cd7994e5424d020 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 5 Nov 2020 14:16:41 -0500 Subject: [PATCH] Enable HTTPS download of image If some software has augmented the xCAT boot process for https, allow that to be recognized. --- xCAT-server/share/xcat/netboot/rh/dracut/xcatroot | 2 +- xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot | 2 +- xCAT-server/share/xcat/netboot/rh/dracut_047/xcatroot | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot b/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot index 423ab6d36..d7b33a347 100755 --- a/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot +++ b/xCAT-server/share/xcat/netboot/rh/dracut/xcatroot @@ -27,7 +27,7 @@ if [ "$NODESTATUS" != "0" ]; then fi if [ ! -z "$imgurl" ]; then - if [ xhttp = x${imgurl%%:*} ]; then + if [ xhttp = x${imgurl%%:*} ] || [ xhttps = x${imgurl%%:*} ]; then NFS=0 FILENAME=${imgurl##*/} while [ ! -r "$FILENAME" ]; do diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot b/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot index b52b49035..89a7f50d2 100755 --- a/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot +++ b/xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot @@ -33,7 +33,7 @@ fi imgurl="$(getarg imgurl=)"; if [ ! -z "$imgurl" ]; then - if [ xhttp = x${imgurl%%:*} ]; then + if [ xhttp = x${imgurl%%:*} ] || [ xhttps = x${imgurl%%:*} ]; then logger $SYSLOGHOST -t $log_label -p local4.info "Downloading rootfs image from $imgurl..." NFS=0 FILENAME=${imgurl##*/} diff --git a/xCAT-server/share/xcat/netboot/rh/dracut_047/xcatroot b/xCAT-server/share/xcat/netboot/rh/dracut_047/xcatroot index b851865b5..6f9f11b28 100755 --- a/xCAT-server/share/xcat/netboot/rh/dracut_047/xcatroot +++ b/xCAT-server/share/xcat/netboot/rh/dracut_047/xcatroot @@ -33,7 +33,7 @@ fi imgurl="$(getarg imgurl=)"; if [ ! -z "$imgurl" ]; then - if [ xhttp = x${imgurl%%:*} ]; then + if [ xhttp = x${imgurl%%:*} ] || [ xhttps = x${imgurl%%:*} ]; then logger $SYSLOGHOST -t $log_label -p local4.info "Downloading rootfs image from $imgurl..." NFS=0 FILENAME=${imgurl##*/}