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

Merge pull request #1256 from rneugeba/infrakit

Browse Source 
infrakit: Use the `moby` tool naming convention to select moby builds
This commit is contained in:
Rolf Neugebauer 2017-03-07 17:18:13 +00:00 committed by GitHub
commit 7b0bdd485e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/infrakit.hyperkit/README.md
View File

@ -34,7 +34,7 @@ Then start the hyperkit plugin:
./build/infrakit-instance-hyperkit ./build/infrakit-instance-hyperkit
``` ```
Next, you can commit a new configuration. There is a sample infrakit config file in `hyperkit.json` which assumes that the directory `./vms/default` contains the `vmlinuz64` and `initrd.img` image to boot. Next, you can commit a new configuration. There is a sample infrakit config file in `hyperkit.json`. It assumes that you have a default moby build in the top-level directory. The `Moby` property needs to be of the form `<dir>/<prefix>` and assumes that the kernel and initrd images are called `<prefix>-bzImage` and `<prefix>-initrd.img` respectively (this is the convention used by the `moby` tool).
``` ```
infrakit group commit hyperkit.json infrakit group commit hyperkit.json
``` ```

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

@ -242,8 +242,8 @@ const hyperkitArgs = "-A -u -F {{.VMLocation}}/hyperkit.pid " +
"-s 2:0,virtio-vpnkit,path={{.VPNKitSock}} " + "-s 2:0,virtio-vpnkit,path={{.VPNKitSock}} " +
"-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}}/vmlinuz64," + "{{.Properties.Moby}}-bzImage," +
"{{.Properties.Moby}}/initrd.img," + "{{.Properties.Moby}}-initrd.img," +
"earlyprintk=serial console=ttyS0 panic=1 vsyscall=emulate page_poison=1 ntp=gateway" "earlyprintk=serial console=ttyS0 panic=1 vsyscall=emulate page_poison=1 ntp=gateway"
func (v hyperkitPlugin) execHyperKit(params map[string]interface{}) error { func (v hyperkitPlugin) execHyperKit(params map[string]interface{}) error {

2
tools/infrakit.hyperkit/hyperkit.json
View File

@ -7,7 +7,7 @@
"Instance": { "Instance": {
"Plugin": "instance-hyperkit", "Plugin": "instance-hyperkit",
"Properties": { "Properties": {
"Moby": "./vms/default", "Moby": "../../moby",
"Disk" : 512, "Disk" : 512,
"CPUs" : 2, "CPUs" : 2,
"Memory" : 1024 "Memory" : 1024