opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 07:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix deploy with iso error

Browse Source
This commit is contained in:
wanyaoqi
2019-03-12 15:27:30 +08:00
parent 95da368f36
commit 6cae515b8d
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/storageman/disk_base.go
+12 -11
View File
@@ -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 {