github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-01-14 01:38:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1264 from tych0/hoist-kernel-cmdline

Browse Source 
Hoist kernel cmdline
This commit is contained in:
Justin Cormack
2017-03-09 22:34:30 +00:00
committed by GitHub
parent 9d3eaefd93 a6c5dbf8f5
commit 6122a483dc
13 changed files with 98 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -26,8 +26,8 @@ test-bzImage: test-initrd.img
# interactive versions need to use volume mounts
.PHONY: qemu qemu-iso
qemu: moby-initrd.img moby-bzImage
./scripts/qemu.sh $^
qemu: moby-initrd.img moby-bzImage bin/moby moby.yaml
./scripts/qemu.sh moby-initrd.img moby-bzImage "$(shell bin/moby --cmdline moby.yaml)"
qemu-iso: alpine/mobylinux-bios.iso
./scripts/qemu.sh $^
@@ -56,8 +56,8 @@ else
endif
.PHONY: hyperkit hyperkit-test
hyperkit: scripts/hyperkit.sh bin/com.docker.hyperkit bin/vpnkit moby-initrd.img moby-bzImage
./scripts/hyperkit.sh moby
hyperkit: scripts/hyperkit.sh bin/com.docker.hyperkit bin/vpnkit moby-initrd.img moby-bzImage moby.yaml
./scripts/hyperkit.sh moby "$(shell bin/moby --cmdline moby.yaml)"
define check_test_log
@cat $1 |grep -q 'Moby test suite PASSED'
@@ -65,7 +65,7 @@ endef
hyperkit-test: scripts/hyperkit.sh bin/com.docker.hyperkit bin/vpnkit test-initrd.img test-bzImage
rm -f disk.img
script -q /dev/null ./scripts/hyperkit.sh test | tee test.log
script -q /dev/null ./scripts/hyperkit.sh test "$(shell bin/moby --cmdline moby.yaml)" | tee test.log
$(call check_test_log, test.log)
.PHONY: test