Merge branch 'testing-merge' into privileged-daemon

README.md

@@ -9,6 +9,7 @@ In this file, we will go over the structure and organization of this repo, and g
  - [.github/workflows/build.yml](.github/workflows/build.yml): This automates builds of the image.
  - [Makefile](Makefile): This contains comamnds for building and cleaning up the image.
  - [build.sh](build.sh): This is called by the makefile. It gets and runs the scripts from Alpine that create a standard Alpine VM image. It also does post-processing that shrinks the VM image.
+ - [httpd.conf](httpd.conf) and [mime.types](mime.types): Config files for apache.
  - [gamezip](gamezip): This is an openrc service definition. It contains the commands for mounting and unmounting AVFS and UnionFS.
  - [needed_mods.txt](needed_mods.txt): This is a list of all the kernel modules needed for our VM to run. There might be some extras that we don't need still on there. I just stopped removing modules when it broke.
  - [setup.sh](setup.sh): This is run (chroot-ed, I think) inside the base VM image. It sets up all the things we need, and removes the things we don't.

build.sh

@@ -21,7 +21,7 @@ tmp=$(mktemp -u /tmp/alpine.XXXXXX)
 wget -qO- "$ALPINE_MAKEVM" \
 | sed 's|^[email protected]|[email protected]:MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNijDxJ8kloskKQpJdx+\\nmTMVFFUGDoDCbulnhZMJoKNkSuZOzBoFC94omYPtxnIcBdWBGnrm6ncbKRlR+6oy\\nDO0W7c44uHKCFGFqBhDasdI4RCYP+fcIX/lyMh6MLbOxqS22TwSLhCVjTyJeeH7K\\naA7vqk+QSsF4TGbYzQDDpg7+6aAcNzg6InNePaywA6hbT0JXbxnDWsB+2/LLSF2G\\nmnhJlJrWB1WGjkz23ONIWk85W4S0XB/ewDefd4Ly/zyIciastA7Zqnh7p3Ody6Q0\\nsS2MJzo7p3os1smGjUF158s6m/JbVh4DN6YIsxwl2OjDOz9R0OycfJSDaBVIGZzg\\ncQIDAQAB\[email protected]|g' \
 | sed 's|^[email protected]|[email protected]:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlEyxkHggKCXC2Wf5Mzx4\\nnZLFZvU2bgcA3exfNPO/g1YunKfQY+Jg4fr6tJUUTZ3XZUrhmLNWvpvSwDS19ZmC\\nIXOu0+V94aNgnhMsk9rr59I8qcbsQGIBoHzuAl8NzZCgdbEXkiY90w1skUw8J57z\\nqCsMBydAueMXuWqF5nGtYbi5vHwK42PffpiZ7G5Kjwn8nYMW5IZdL6ZnMEVJUWC9\\nI4waeKg0yskczYDmZUEAtrn3laX9677ToCpiKrvmZYjlGl0BaGp3cxggP2xaDbUq\\nqfFxWNgvUAb3pXD09JM6Mt6HSIJaFc9vQbrKB9KT515y763j5CC2KUsilszKi3mB\\nHYe5PoebdjS7D1Oh+tRqfegU2IImzSwW3iwA7PJvefFuc/kNIijfS/gH/cAqAK6z\\nbhdOtE/zc7TtqW2Wn5Y03jIZdtm12CxSxwgtCF1NPyEWyIxAQUX9ACb3M0FAZ61n\\nfpPrvwTaIIxxZ01L3IzPLpbc44x/DhJIEU+iDt6IMTrHOphD9MCG4631eIdB0H1b\\n6zbNX1CXTsafqHRFV9XmYYIeOMggmd90s3xIbEujA6HKNP/gwzO6CDJ+nHFDEqoF\\nSkxRdTkEqjTjVKieURW7Swv7zpfu5PrsrrkyGnsRrBJJzXlm2FOOxnbI2iSL1B5F\\nrO5kbUxFeZUIDq+7Yv4kLWcCAwEAAQ==\[email protected]|g' \
-| sh /dev/stdin -f qcow2 -c "$tmp" setup.sh \
+| sh /dev/stdin -f qcow2 -c "$tmp" -s 512M setup.sh \
 && echo Shrinking image, please wait \
 && qemu-img convert -c -O qcow2 "$tmp" "start_$1" \
 && qemu-img convert -c -O qcow2 "start_$1" "mid_$1" \