From ffe1e5f57bb86ba48a94027cb82158e3bf5e7e76 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 30 Jul 2013 22:31:07 -0700
Subject: [PATCH] builder/amazon/chroot: default volumes dir is relative

---
 builder/amazon/chroot/builder.go           | 2 +-
 builder/amazon/chroot/step_mount_device.go | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go
index 3a42045fb..6eafb0b30 100644
--- a/builder/amazon/chroot/builder.go
+++ b/builder/amazon/chroot/builder.go
@@ -72,7 +72,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
 	}
 
 	if b.config.MountPath == "" {
-		b.config.MountPath = "/var/packer-amazon-chroot/volumes/{{.Device}}"
+		b.config.MountPath = "packer-amazon-chroot-volumes/{{.Device}}"
 	}
 
 	if b.config.UnmountCommand == "" {
diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go
index 9dc4f1743..8d6815427 100644
--- a/builder/amazon/chroot/step_mount_device.go
+++ b/builder/amazon/chroot/step_mount_device.go
@@ -36,7 +36,16 @@ func (s *StepMountDevice) Run(state map[string]interface{}) multistep.StepAction
 		Device: filepath.Base(device),
 	})
 
+	var err error
 	mountPath := mountPathRaw.String()
+	mountPath, err = filepath.Abs(mountPath)
+	if err != nil {
+		err := fmt.Errorf("Error preparing mount directory: %s", err)
+		state["error"] = err
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
 	log.Printf("Mount path: %s", mountPath)
 
 	if err := os.MkdirAll(mountPath, 0755); err != nil {