Merge pull request #143 from dlorenc/err

Defer the unmount.

Author: zchee

xhyve/xhyve.go

@@ -594,15 +594,20 @@ func (d *Driver) publicSSHKeyPath() string {
 	return d.GetSSHKeyPath() + ".pub"
 }
 
-func (d *Driver) extractKernelImages() error {
+func (d *Driver) extractKernelImages() (err error) {
 	log.Debugf("Mounting %s", isoFilename)
 
-	err := hdiutil("attach", d.ResolveStorePath(isoFilename), "-mountpoint", d.ResolveStorePath(isoMountPath))
+	volumeRootDir := d.ResolveStorePath(isoMountPath)
+	err = hdiutil("attach", d.ResolveStorePath(isoFilename), "-mountpoint", volumeRootDir)
 	if err != nil {
 		return err
 	}
 
-	volumeRootDir := d.ResolveStorePath(isoMountPath)
+	defer func() {
+		log.Debugf("Unmounting %s", isoFilename)
+		err = hdiutil("detach", volumeRootDir)
+	}()
+
 	vmlinuz := filepath.Join(volumeRootDir, "boot", d.Vmlinuz)
 	initrd := filepath.Join(volumeRootDir, "boot", d.Initrd)
 
@@ -616,11 +621,6 @@ func (d *Driver) extractKernelImages() error {
 		return err
 	}
 
-	log.Debugf("Unmounting %s", isoFilename)
-	if err := hdiutil("detach", volumeRootDir); err != nil {
-		return err
-	}
-
 	return nil
 }