syonad/two
2
0
Fork 0
Code Issues 6 Pull requests 1 Projects Releases 9 Packages Wiki Activity Actions

f-32: fix: update boot order
All checks were successful
Pre Release Workflow / set-release-target (push) Successful in 1s
Details
Pre Release Workflow / upload-scripts (run-dnsmasq-in-netns.sh) (push) Successful in 6s
Details
Pre Release Workflow / build (agent, amd64, linux) (push) Successful in 1m34s
Details
Pre Release Workflow / build (metadata, amd64, linux) (push) Successful in 1m31s
Details
Pre Release Workflow / prerelease (push) Successful in 10s
Details

Browse source 
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-05-24 16:47:49 +02:00
commit c3f26836cd
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/qemu/start_linux.go
View file

@ -65,18 +65,29 @@ func Start(cfg Config) error {
sorted := make([]DiskConfig, len(cfg.Disks))
copy(sorted, cfg.Disks)
sort.Slice(sorted, func(i, j int) bool { return sorted[i].Dev < sorted[j].Dev })
// vd* avant sd* : les disques virtio-blk bootent en premier.
// À lettre égale de type, ordre alphabétique.
sort.Slice(sorted, func(i, j int) bool {
iVirtio := strings.HasPrefix(sorted[i].Dev, "vd")
jVirtio := strings.HasPrefix(sorted[j].Dev, "vd")
if iVirtio != jVirtio {
return iVirtio
}
return sorted[i].Dev < sorted[j].Dev
})
for _, d := range sorted {
for idx, d := range sorted {
bootindex := idx + 1
if strings.HasPrefix(d.Dev, "sd") {
scsiID := int(d.Dev[2] - 'a')
args = append(args,
"-drive", fmt.Sprintf("file=%s,if=none,id=%s", d.Path, d.Dev),
"-device", fmt.Sprintf("scsi-hd,drive=%s,bus=scsi0.0,scsi-id=%d", d.Dev, scsiID),
"-device", fmt.Sprintf("scsi-hd,drive=%s,bus=scsi0.0,scsi-id=%d,bootindex=%d", d.Dev, scsiID, bootindex),
)
} else {
args = append(args,
"-drive", fmt.Sprintf("file=%s,if=virtio,id=%s", d.Path, d.Dev),
"-drive", fmt.Sprintf("file=%s,if=none,id=%s", d.Path, d.Dev),
"-device", fmt.Sprintf("virtio-blk-pci,drive=%s,bootindex=%d", d.Dev, bootindex),
)
}
}