From c39562906eaeee816fb8c282727c5e383ac1fe41 Mon Sep 17 00:00:00 2001
From: Micah Lee <micah@micahflee.com>
Date: Fri, 25 Jun 2021 12:20:42 -0700
Subject: [PATCH] Extract vmlinuz and initramfs as well

---
 rip_docker/vm-image-builder/.gitignore |  2 +-
 rip_docker/vm-image-builder/build.sh   | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/rip_docker/vm-image-builder/.gitignore b/rip_docker/vm-image-builder/.gitignore
index 5db08dc..c585e19 100644
--- a/rip_docker/vm-image-builder/.gitignore
+++ b/rip_docker/vm-image-builder/.gitignore
@@ -1 +1 @@
-dangerzone.qcow2
\ No newline at end of file
+out
\ No newline at end of file
diff --git a/rip_docker/vm-image-builder/build.sh b/rip_docker/vm-image-builder/build.sh
index 4b77208..61e7006 100755
--- a/rip_docker/vm-image-builder/build.sh
+++ b/rip_docker/vm-image-builder/build.sh
@@ -1,11 +1,23 @@
 #!/bin/bash
+
+# Install dependencies
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
 apt-get install -y qemu-utils wget nbdfuse
+
+# Build the VM image
 cd /build
+mkdir -p /build/out
 ./alpine-make-vm-image \
     --image-format qcow2 \
     --image-size 2G \
     --packages "$(cat packages)" \
     --script-chroot \
-    dangerzone.qcow2 -- ./configure.sh
+    /build/out/dangerzone.qcow2 -- ./configure.sh
+
+# Extract vmlinuz and initramfs
+qemu-nbd -c /dev/nbd0 /build/out/dangerzone.qcow2
+mount /dev/nbd0 /mnt
+cp /mnt/boot/vmlinuz-virt /build/out
+cp /mnt/boot/initramfs-virt /build/out
+umount /mnt