From 6cae515b8d9decd93a0d7676cd3bfba6cfcbcbde Mon Sep 17 00:00:00 2001
From: wanyaoqi <wanyaoqi@yunion.cn>
Date: Tue, 12 Mar 2019 15:27:30 +0800
Subject: [PATCH] fix deploy with iso error

---
 pkg/hostman/storageman/disk_base.go | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkg/hostman/storageman/disk_base.go b/pkg/hostman/storageman/disk_base.go
index 3dc7067bab..8a6806e9d6 100644
--- a/pkg/hostman/storageman/disk_base.go
+++ b/pkg/hostman/storageman/disk_base.go
@@ -89,18 +89,19 @@ func (d *SBaseDisk) DeployGuestFs(diskPath string, guestDesc *jsonutils.JSONDict
 	var kvmDisk = NewKVMGuestDisk(diskPath)
 
 	defer kvmDisk.Disconnect()
-	if kvmDisk.Connect() {
-		log.Infof("Kvm Disk Connect Success !!")
-		if root := kvmDisk.MountKvmRootfs(); root != nil {
-			defer kvmDisk.UmountKvmRootfs(root)
-
-			return guestfs.DeployGuestFs(root, guestDesc, deployInfo)
-		} else {
-			return nil, fmt.Errorf("Kvm Disk Mount error")
-		}
-	} else {
-		return nil, fmt.Errorf("Kvm disk connecterror")
+	if !kvmDisk.Connect() {
+		log.Infof("Failed to connect kvm disk")
+		return nil, nil
 	}
+
+	root := kvmDisk.MountKvmRootfs()
+	if root == nil {
+		log.Infof("Disk cann't found root fs")
+		return nil, nil
+	}
+	defer kvmDisk.UmountKvmRootfs(root)
+
+	return guestfs.DeployGuestFs(root, guestDesc, deployInfo)
 }
 
 func (d *SBaseDisk) GetDiskSetupScripts(diskIndex int) string {