From 3361963d6cb8986599db9356ead5744abecdb2a6 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Fri, 22 Jan 2016 17:12:00 +0000
Subject: [PATCH 1/2] kernel: add Hyper-V para-virtual device drivers to the
 kernel

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 alpine/kernel/kernel_config | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/alpine/kernel/kernel_config b/alpine/kernel/kernel_config
index e83c0b354..f89a65f48 100644
--- a/alpine/kernel/kernel_config
+++ b/alpine/kernel/kernel_config
@@ -2175,7 +2175,11 @@ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 #
 # Microsoft Hyper-V guest support
 #
-# CONFIG_HYPERV is not set
+CONFIG_HYPERV=y
+CONFIG_HYPERV_STORAGE=y
+CONFIG_HYPERV_NET=y
+CONFIG_HYPERV_UTILS=y
+CONFIG_HYPERV_KEYBOARD=y
 
 #
 # Xen driver support

From 6827b99b55d1c4fcaf2e01e62f7fce2f7a20704a Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Fri, 22 Jan 2016 17:13:11 +0000
Subject: [PATCH 2/2] moby: add support for building an ISO image for Moby

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 alpine/.gitignore     |  1 +
 alpine/Dockerfile.iso | 24 ++++++++++++++++++++++++
 alpine/Makefile       |  6 ++++++
 alpine/isolinux.cfg   |  5 +++++
 4 files changed, 36 insertions(+)
 create mode 100644 alpine/Dockerfile.iso
 create mode 100644 alpine/isolinux.cfg

diff --git a/alpine/.gitignore b/alpine/.gitignore
index 7338f15d5..129c3b59f 100644
--- a/alpine/.gitignore
+++ b/alpine/.gitignore
@@ -1,3 +1,4 @@
 *.img
+mobylinux.iso
 Dockerfile.armhf
 etc/inittab
diff --git a/alpine/Dockerfile.iso b/alpine/Dockerfile.iso
new file mode 100644
index 000000000..a9eb38fdb
--- /dev/null
+++ b/alpine/Dockerfile.iso
@@ -0,0 +1,24 @@
+FROM ubuntu:15.10
+
+RUN apt-get update && apt-get -y upgrade && apt-get -y install \
+  genisoimage \
+  xorriso \
+  syslinux \
+  syslinux-utils \
+  isolinux
+
+RUN mkdir -p /tmp/iso/isolinux && \
+    cp /usr/lib/ISOLINUX/isolinux.bin /tmp/iso/isolinux && \
+    cp usr/lib/syslinux/modules/bios/ldlinux.c32 /tmp/iso/isolinux
+
+COPY initrd.img /tmp/iso
+COPY kernel/vmlinuz64 /tmp/iso
+COPY isolinux.cfg /tmp/iso/isolinux
+
+RUN cd /tmp/iso && \
+    genisoimage -o ../output.iso -l -J -R \
+                -c isolinux/boot.cat  \
+                -b isolinux/isolinux.bin \
+                   -no-emul-boot -boot-load-size 4 -boot-info-table \
+                -V MobyLinux . && \
+    isohybrid ../output.iso
diff --git a/alpine/Makefile b/alpine/Makefile
index ee6dba147..e6c86b5dc 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -12,6 +12,10 @@ initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES)
 	docker build -t mobyinitrd:build .
 	docker run mobyinitrd:build /bin/mkinitrd.sh > $@
 
+mobylinux.iso: initrd.img Dockerfile.iso isolinux.cfg
+	docker build -f Dockerfile.iso -t mobyiso:build .
+	docker run mobyiso:build cat /tmp/output.iso > $@
+
 arm:	initrd-arm.img
 
 Dockerfile.armhf: Dockerfile
@@ -28,6 +32,8 @@ initrd-arm.img: Dockerfile.armhf
 
 clean:
 	rm -f initrd.img initrd-arm.img Dockerfile.armhf etc/inittab
+	rm -f mobylinux.iso
 	$(MAKE) -C packages clean
 	$(MAKE) -C kernel clean
 	docker images -q mobyinitrd:build | xargs docker rmi -f
+	docker images -q mobyiso:build | xargs docker rmi -f
diff --git a/alpine/isolinux.cfg b/alpine/isolinux.cfg
new file mode 100644
index 000000000..5a15eb15c
--- /dev/null
+++ b/alpine/isolinux.cfg
@@ -0,0 +1,5 @@
+DEFAULT linux
+LABEL linux
+    KERNEL /vmlinuz64
+    INITRD /initrd.img
+    APPEND earlyprintk=serial console=ttyS0
\ No newline at end of file