diff --git a/components/os/debian_disable_upgrades.go b/components/os/debian_disable_upgrades.go new file mode 100644 index 000000000..c3fec21d4 --- /dev/null +++ b/components/os/debian_disable_upgrades.go @@ -0,0 +1,8 @@ +package os + +import ( + _ "embed" +) + +//go:embed scripts/debian-disable-unattended-upgrades.sh +var DebianDisableUnattendedUpgradesScriptContent string diff --git a/components/os/scripts/debian-disable-unattended-upgrades.sh b/components/os/scripts/debian-disable-unattended-upgrades.sh new file mode 100644 index 000000000..d89f30384 --- /dev/null +++ b/components/os/scripts/debian-disable-unattended-upgrades.sh @@ -0,0 +1,2 @@ +#!/bin/bash +apt-get -y remove unattended-upgrades \ No newline at end of file diff --git a/components/os/windows_setup_ssh.go b/components/os/windows_setup_ssh.go index 5bf14e4e6..b957da714 100644 --- a/components/os/windows_setup_ssh.go +++ b/components/os/windows_setup_ssh.go @@ -5,4 +5,4 @@ import ( ) //go:embed scripts/setup-ssh.ps1 -var SetupSSHScriptContent string +var WindowsSetupSSHScriptContent string diff --git a/resources/azure/compute/vm.go b/resources/azure/compute/vm.go index 0b0d36cc8..3782b4bff 100644 --- a/resources/azure/compute/vm.go +++ b/resources/azure/compute/vm.go @@ -105,7 +105,7 @@ func NewWindowsInstance(e azure.Environment, name, imageUrn, instanceType string AsyncExecution: pulumi.Bool(false), RunCommandName: pulumi.String("InitVM"), Source: compute.VirtualMachineRunCommandScriptSourceArgs{ - Script: pulumi.String(strings.Join([]string{setupSSHParamScriptContent, componentsos.SetupSSHScriptContent}, "\n\n")), + Script: pulumi.String(strings.Join([]string{setupSSHParamScriptContent, componentsos.WindowsSetupSSHScriptContent}, "\n\n")), }, Parameters: compute.RunCommandInputParameterArray{ compute.RunCommandInputParameterArgs{ diff --git a/scenarios/aws/ec2/os_win.go b/scenarios/aws/ec2/os_win.go index e96eabff9..1d6eb6f67 100644 --- a/scenarios/aws/ec2/os_win.go +++ b/scenarios/aws/ec2/os_win.go @@ -15,7 +15,7 @@ func getWindowsOpenSSHUserData(publicKeyPath string) (string, error) { } return buildAWSPowerShellUserData( - componentsos.SetupSSHScriptContent, + componentsos.WindowsSetupSSHScriptContent, windowsPowerShellArgument{name: "authorizedKey", value: string(publicKey)}, ), nil diff --git a/scenarios/aws/ec2/vm.go b/scenarios/aws/ec2/vm.go index a8ba4f025..3409a059b 100644 --- a/scenarios/aws/ec2/vm.go +++ b/scenarios/aws/ec2/vm.go @@ -142,8 +142,9 @@ func defaultVMArgs(e aws.Environment, vmArgs *vmArgs) error { if err != nil { return err } - vmArgs.userData = vmArgs.userData + sshUserData + } else if vmArgs.osInfo.Flavor == os.Ubuntu || vmArgs.osInfo.Flavor == os.Debian { + vmArgs.userData = vmArgs.userData + os.DebianDisableUnattendedUpgradesScriptContent } return nil