github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

infrakit: Attach ISO file to VM if it exists

Browse Source 
The file can me mounted in the VM as /dev/sr0

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-03-10 14:55:23 +00:00
parent cde6fb9309
commit 562bc65dec
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/infrakit.hyperkit/cmd/instance.go
View File

@ -239,9 +239,11 @@ func (v hyperkitPlugin) DescribeInstances(tags map[string]string) ([]instance.De
const hyperkitArgs = "-A -u -F {{.VMLocation}}/hyperkit.pid " + const hyperkitArgs = "-A -u -F {{.VMLocation}}/hyperkit.pid " +
"-c {{.Properties.CPUs}} -m {{.Properties.Memory}}M " + "-c {{.Properties.CPUs}} -m {{.Properties.Memory}}M " +
"-s 0:0,hostbridge -s 31,lpc -s 5,virtio-rnd " + "-s 0:0,hostbridge " +
"-s 4,virtio-blk,{{.VMLocation}}/disk.img " + "-s 1:0,virtio-vpnkit,path={{.VPNKitSock}} " +
"-s 2:0,virtio-vpnkit,path={{.VPNKitSock}} " + "-s 2,virtio-blk,{{.VMLocation}}/disk.img " +
"-s 10,virtio-rnd " +
"-s 31,lpc " +
"-l com1,autopty={{.VMLocation}}/tty,log={{.VMLocation}}/console-ring" "-l com1,autopty={{.VMLocation}}/tty,log={{.VMLocation}}/console-ring"
const hyperkitKernArgs = "kexec," + const hyperkitKernArgs = "kexec," +
"{{.Properties.Moby}}-bzImage," + "{{.Properties.Moby}}-bzImage," +
@ -260,7 +262,6 @@ func (v hyperkitPlugin) execHyperKit(spec instance.Spec, params map[string]inter
if err != nil { if err != nil {
return err return err
} }
// Build arguments // Build arguments
c := []string{v.HyperKit} c := []string{v.HyperKit}
c = append(c, strings.Split(args, " ")...) c = append(c, strings.Split(args, " ")...)
@ -286,6 +287,7 @@ func (v hyperkitPlugin) execHyperKit(spec instance.Spec, params map[string]inter
if err != nil { if err != nil {
return err return err
} }
c = append(c, "-s", "4,ahci-cd,"+path.Join(instanceDir, "config.iso"))
} }
cmd := exec.Command(c[0], c[1:]...) cmd := exec.Command(c[0], c[1:]...)