Skip to content

fix(cloud-hypervisor): pass block devices in a single --disk flag #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CapThunder19 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −1
Open

fix(cloud-hypervisor): pass block devices in a single --disk flag #990

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/unikontainers/hypervisors/cloud_hypervisor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ func (ch *CloudHypervisor) BuildExecCmd(args types.ExecArgs, ukernel types.Unike

// Block device configuration
blockArgs := ukernel.MonitorBlockCli()
var disks []string
for _, blockArg := range blockArgs {
if blockArg.ExactArgs != "" {
exArgs = append(exArgs, strings.Split(strings.TrimSpace(blockArg.ExactArgs), " ")...)
Expand All @@ -116,9 +117,13 @@ func (ch *CloudHypervisor) BuildExecCmd(args types.ExecArgs, ukernel types.Unike
if blockArg.ID != "" {
diskArg += fmt.Sprintf(",id=%s", blockArg.ID)
}
exArgs = append(exArgs, "--disk", diskArg)
disks = append(disks, diskArg)
}
}
if len(disks) > 0 {
exArgs = append(exArgs, "--disk")
exArgs = append(exArgs, disks...)
}

// Initrd configuration
if args.InitrdPath != "" {
Expand Down