From 519f6acddd40cd26775cf825a3a91b530c5ddf2b Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 1 Apr 2017 16:22:35 +0100 Subject: [PATCH 1/2] tools: Fix make-efi script mkfs.vfat prints output (even without the -v option) which ends up in front of the ISO, which is cat'ed to stdout. This made the generated ISO unbootable. Redirect stdout of mkfs.vfat to /dev/null. Signed-off-by: Rolf Neugebauer --- tools/mkimage-iso-efi/make-efi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/mkimage-iso-efi/make-efi b/tools/mkimage-iso-efi/make-efi index e8a0c09ce..a5fe3b255 100755 --- a/tools/mkimage-iso-efi/make-efi +++ b/tools/mkimage-iso-efi/make-efi @@ -41,7 +41,7 @@ mkdir -p iso # headroom seems to be enough; (x+31)/32*32 rounds up to multiple of 32. mkfs.vfat -v -C iso/efi.raw \ $(( ($(stat -c %s "mobylinux.efi") / 1024 + 511) \ - / 32 * 32 )) + / 32 * 32 )) > /dev/null echo "mtools_skip_check=1" >> /etc/mtools.conf && \ mmd -i iso/efi.raw ::/EFI mmd -i iso/efi.raw ::/EFI/BOOT From 838e31602042357e7c86f95df0bc1a3238666ef5 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sat, 1 Apr 2017 16:25:02 +0100 Subject: [PATCH 2/2] cli: Use fixed mkimage-iso-efi image Signed-off-by: Rolf Neugebauer --- src/cmd/moby/output.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/moby/output.go b/src/cmd/moby/output.go index 609b1b311..f69f5a8a4 100644 --- a/src/cmd/moby/output.go +++ b/src/cmd/moby/output.go @@ -12,7 +12,7 @@ import ( const ( bios = "mobylinux/mkimage-iso-bios:489b1f054a77a8f379d0bfc6cd91639b4db6b67c@sha256:0f058951aac4367d132682aa19eeb5cdcb05600a5d51fe5d0fcbd97b03ae4f87" - efi = "mobylinux/mkimage-iso-efi:d86021840d2180422bd2f59dcff2fcfb5aea6ad1@sha256:00a6dc21073a24763bc667cadd90c42b69cd69579f8036d6d794b42cbb583142" + efi = "mobylinux/mkimage-iso-efi:1b0ea6b8a7956e67e903876be5baf476e9a5cc40@sha256:a026cd9e9d0146503274e575a165039c67b853bde0013ade78df80d9280ffa7c" gce = "mobylinux/mkimage-gce:2039be4e39e855d1845aee188e266bba3f1d2eed@sha256:e12f76003fd9eaa0c6f39f149db5998cf56de42539b989c994893c8344ca69c0" qcow = "mobylinux/mkimage-qcow:9b3632f111675898ed3a22ac71897e735b5a8364@sha256:2132cf3fb593d65f09c8d109d40e1fad138d81485d4750fc29a7f54611d78d35" vhd = "mobylinux/mkimage-vhd:73c80e433bf717578c507621a84fd58cec27fe95@sha256:0ae1eda2d6592f309977dc4b25cca120cc4e2ee2cc786e88fdc2761c0d49cb14"