From 1432ca75fca5fe6f1aed8d6eb646b3812374cdf1 Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Fri, 13 Aug 2021 15:02:23 -0700 Subject: [PATCH] Base the VM image off Alpine 3.14.1, update the alpine profile to be based off virt instead of standard --- install/vm-builder/build-iso.sh | 2 +- install/vm-builder/genapkovl-dangerzone.sh | 2 +- install/vm-builder/mkimg.dangerzone.sh | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/install/vm-builder/build-iso.sh b/install/vm-builder/build-iso.sh index 138c241..3d3d754 100755 --- a/install/vm-builder/build-iso.sh +++ b/install/vm-builder/build-iso.sh @@ -32,7 +32,7 @@ chmod 777 /vagrant/vm # Make the iso cd ~/aports/scripts -sudo -u user sh mkimage.sh --tag v3.14 \ +sudo -u user sh mkimage.sh --tag v3.14.1 \ --outdir /vagrant/vm \ --arch x86_64 \ --repository http://dl-cdn.alpinelinux.org/alpine/v3.14/main \ diff --git a/install/vm-builder/genapkovl-dangerzone.sh b/install/vm-builder/genapkovl-dangerzone.sh index 6455263..403fb1f 100644 --- a/install/vm-builder/genapkovl-dangerzone.sh +++ b/install/vm-builder/genapkovl-dangerzone.sh @@ -34,7 +34,7 @@ rc_add cgroups boot # Start dropbear (ssh server) rc_add dropbear boot -# Run setup-alpine +# Initialize the dangerzone VM rc_add dangerzone boot # Other init scripts diff --git a/install/vm-builder/mkimg.dangerzone.sh b/install/vm-builder/mkimg.dangerzone.sh index 40cf85e..92c873f 100644 --- a/install/vm-builder/mkimg.dangerzone.sh +++ b/install/vm-builder/mkimg.dangerzone.sh @@ -1,13 +1,8 @@ profile_dangerzone() { - profile_standard + profile_virt profile_abbrev="dangerzone" title="Dangerzone" desc="Copied from virt but with extra apks and an apkovl" - arch="aarch64 armv7 x86 x86_64" - kernel_addons= - kernel_flavors="virt" - kernel_cmdline="console=tty0 console=ttyS0,115200" - syslinux_serial="0 115200" apkovl="genapkovl-dangerzone.sh" - apks="$apks podman dropbear autossh python3 sudo" + apks="$apks podman dropbear autossh python3 sudo" }