Check for EBS being nil before assigning it

33b4f5cc · James Nugent · e99cd56b · 33b4f5cc
Commit 33b4f5cc authored Apr 15, 2015 by James Nugent
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

builder/amazon/chroot/step_register_ami.go builder/amazon/chroot/step_register_ami.go +5 -1

No files found.
--- a/builder/amazon/chroot/step_register_ami.go
+++ b/builder/amazon/chroot/step_register_ami.go
@@ -25,7 +25,11 @@ func (s *StepRegisterAMI) Run(state multistep.StateBag) multistep.StepAction {
 	for i, device := range image.BlockDeviceMappings {
 		newDevice := device
 		if newDevice.DeviceName == image.RootDeviceName {
-			newDevice.EBS.SnapshotID = &snapshotId
+			if newDevice.EBS != nil {
+				newDevice.EBS.SnapshotID = &snapshotId
+			} else {
+				newDevice.EBS = &ec2.EBSBlockDevice{SnapshotID: &snapshotId}
+			}
 		}
 		blockDevices[i] = newDevice