From b9021f9277e83b488c27c434ea6fee3c3d85490d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 14 Jun 2019 15:42:09 +0000 Subject: [PATCH] cloud-init: Execute setup script for Azure if needed Signed-off-by: Michael Tremer --- src/initscripts/system/cloud-init | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/initscripts/system/cloud-init b/src/initscripts/system/cloud-init index 4bd474b0ba..f385ce5d19 100644 --- a/src/initscripts/system/cloud-init +++ b/src/initscripts/system/cloud-init @@ -46,8 +46,15 @@ running_on_azure() { case "${1}" in start) - # Do nothing if we are not running on AWS EC2 - running_on_ec2 || exit 0 + # Check if we are running in the cloud + if running_on_ec2; then + scriptname="/etc/rc.d/helper/aws-setup" + elif running_on_azure; then + scriptname="/etc/rc.d/helper/azure-setup" + else + # This system is not running in the cloud + exit 0 + fi # Find the first interface to use for i in /sys/class/net/red* /sys/class/net/eth* \ @@ -72,10 +79,10 @@ case "${1}" in fi # Run a DHCP client and set up the system accordingly - dhclient -sf /etc/rc.d/helper/aws-setup "${intf}" + dhclient -sf "${scriptname}" "${intf}" # End DHCP client immediately - dhclient -sf /etc/rc.d/helper/aws-setup -r "${intf}" &>/dev/null + dhclient -sf "${scriptname}" -r "${intf}" &>/dev/null # Rename network devices udevadm trigger --action="add" --subsystem-match="net" -- 2.39.5