From f25230a151e5ecdfddbbd628e0b60557e28463e6 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 10 Mar 2016 11:09:54 +0000 Subject: [PATCH] generate compressed initrd, use it for xhyverun Signed-off-by: Justin Cormack --- alpine/.gitignore | 1 + alpine/Makefile | 7 +++++-- xhyve/xhyverun.sh | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/alpine/.gitignore b/alpine/.gitignore index 129c3b59f..fd95f3b16 100644 --- a/alpine/.gitignore +++ b/alpine/.gitignore @@ -1,4 +1,5 @@ *.img +*.img.gz mobylinux.iso Dockerfile.armhf etc/inittab diff --git a/alpine/Makefile b/alpine/Makefile index 6470ea963..c29d8b3dc 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -1,4 +1,4 @@ -all: initrd.img +all: initrd.img.gz ETCFILES=etc/issue etc/motd etc/network/interfaces ETCFILES+=etc/securetty @@ -11,6 +11,9 @@ initrd.img: Dockerfile mkinitrd.sh repositories $(ETCFILES) docker-compose build moby docker-compose run --rm -T moby /bin/mkinitrd.sh +initrd.img.gz: initrd.img + cat initrd.img | gzip -9 > initrd.img.gz + mobylinux.iso: initrd.img Dockerfile.iso isolinux.cfg docker-compose build iso docker-compose run --rm -T iso cp /tmp/output.iso /mnt/mobylinux.iso @@ -34,7 +37,7 @@ initrd-arm.img: Dockerfile.armhf docker-compose run --rm -T arm /bin/mkinitrd.sh > $@ clean: - rm -f initrd.img initrd-arm.img Dockerfile.armhf etc/inittab + rm -f initrd.img initrd.img.gz initrd-arm.img Dockerfile.armhf etc/inittab rm -f mobylinux.iso $(MAKE) -C packages clean $(MAKE) -C kernel clean diff --git a/xhyve/xhyverun.sh b/xhyve/xhyverun.sh index a641062e9..319cd6d01 100755 --- a/xhyve/xhyverun.sh +++ b/xhyve/xhyverun.sh @@ -1,7 +1,7 @@ #!/bin/sh KERNEL="../alpine/kernel/vmlinuz64" -INITRD="../alpine/initrd.img" +INITRD="../alpine/initrd.img.gz" CMDLINE="earlyprintk=serial console=ttyS0" MEM="-m 1G"