check if newDevice.EBS is nil

8a9a59c3 · Clint Shryock · 9f8b0041 · 8a9a59c3
Commit 8a9a59c3 authored Jun 23, 2015 by Clint Shryock
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/builder/amazon/chroot/step_register_ami.go
+++ b/builder/amazon/chroot/step_register_ami.go
@@ -34,7 +34,7 @@ func (s *StepRegisterAMI) Run(state multistep.StateBag) multistep.StepAction {
 		// assume working from a snapshot, so we unset the Encrypted field if set,
 		// otherwise AWS API will return InvalidParameter
-		if newDevice.EBS.Encrypted != nil {
+		if newDevice.EBS != nil && newDevice.EBS.Encrypted != nil {
 			newDevice.EBS.Encrypted = nil
 		}