Merge pull request #10259 from Security-Onion-Solutions/jertel/simplifycd

simplify cloud detection
This commit is contained in:
Jason Ertel
2023-05-01 11:33:26 -04:00
committed by GitHub

View File

@@ -1124,9 +1124,8 @@ create_repo() {
detect_cloud() {
echo "Testing if setup is running on a cloud instance..." | tee -a "$setup_log"
if ( curl --fail -s -m 5 http://169.254.169.254/latest/meta-data/instance-id > /dev/null ) || \
( curl --fail -s -m 5 -H "X-aws-ec2-metadata-token: $(curl -s -X PUT -m 5 'http://169.254.169.254/latest/api/token' -H 'X-aws-ec2-metadata-token-ttl-seconds: 30')" http://169.254.169.254/latest/meta-data/instance-id > /dev/null) || \
(dmidecode -s bios-vendor | grep -q Google > /dev/null) || \
if dmidecode -s bios-version | grep -q amazon || \
dmidecode -s bios-vendor | grep -q Google || \
[ -f /var/log/waagent.log ]; then
echo "Detected a cloud installation." | tee -a "$setup_log"