fix(host-deployer): deploy single disk has no disk id (#24306)

This commit is contained in:
wanyaoqi
2026-02-10 19:36:18 +08:00
committed by GitHub
parent aaa314feca
commit cd5e71e037
2 changed files with 7 additions and 1 deletions

View File

@@ -31,6 +31,9 @@ func (d *SFsutilDriver) GetResizeDevBySerial(diskId string) (string, error) {
}
lines := strings.Split(string(out), "\n")
diskSerial := strings.ReplaceAll(diskId, "-", "")
if len(diskSerial) >= 20 {
diskSerial = diskSerial[:20]
}
resizeDev := ""
for i := range lines {
segs := strings.Fields(lines[i])

View File

@@ -698,7 +698,10 @@ func (d *QemuBaseDriver) startCmds(
cmd += diskDrive
serialId := strings.ReplaceAll(diskIds[i], "-", "")
deviceId := serialId[:20]
if len(serialId) >= 20 {
serialId = serialId[:20]
}
deviceId := serialId
cmd += __("-device scsi-hd,drive=drive_%d,bus=scsi.0,id=drive_%d,serial=%s,device_id=%s", i, i, serialId, deviceId)
}
cmd += __("-drive id=cd0,if=none,media=cdrom,file=%s", DEPLOY_ISO)