From 874ce82c166006f05a559a7d9c8feab9769140bf Mon Sep 17 00:00:00 2001 From: Vincent Ni Date: Tue, 28 Feb 2023 10:35:17 -0800 Subject: [PATCH 1/3] tailor cert installation script for al2 --- make/photon/common/install_cert.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/make/photon/common/install_cert.sh b/make/photon/common/install_cert.sh index c536b5665..3247e4950 100755 --- a/make/photon/common/install_cert.sh +++ b/make/photon/common/install_cert.sh @@ -2,15 +2,11 @@ set -e -if ! grep -q "Photon" /etc/lsb-release; then - echo "Current OS is not Photon, skip appending ca bundle" - exit 0 -fi - ORIGINAL_LOCATION=$(dirname "$0") if [ ! -f $ORIGINAL_LOCATION/ca-bundle.crt.original ]; then - cp /etc/pki/tls/certs/ca-bundle.crt $ORIGINAL_LOCATION/ca-bundle.crt.original + cp --no-preserve=mode,ownership /etc/pki/tls/certs/ca-bundle.crt $ORIGINAL_LOCATION/ca-bundle.crt.original + rm -f /etc/pki/tls/certs/* fi cp $ORIGINAL_LOCATION/ca-bundle.crt.original /etc/pki/tls/certs/ca-bundle.crt -- 2.39.2 (Apple Git-143)