Minor Fixes

* switch 3.12 back to tiny-ec2-bootstrap (tiny-cloud requires ifupdown-ng)
* restrict cloud-init to 3.15+
* pad UEFI firmware so QEMU works with aarch64 again
* kinda fix motd release_notes (more to do yet)
This commit is contained in:
Jake Buchholz Göktürk 2022-03-19 14:24:26 -07:00
parent 5e8967002e
commit 7ac2029267
5 changed files with 40 additions and 14 deletions

5
build
View File

@ -185,7 +185,10 @@ def install_qemu_firmware():
log.error('STDERR:\n%s', err.decode('utf8'))
sys.exit(1)
os.symlink(bin, os.path.join(firm_dir, f"uefi-{arch}.bin"))
firm_bin = os.path.join(firm_dir, f"uefi-{arch}.bin")
os.symlink(bin, firm_bin)
log.info('Padding "%s" to 67108864 bytes', firm_bin)
subprocess.run(['truncate', '-s', '67108864', firm_bin])
### Command Line & Logging

View File

@ -23,8 +23,8 @@ Default {
"See <https://wiki.alpinelinux.org/>."
version_notes = "Release Notes:\n"\
"* <https://alpinelinux.org/posts/alpine-{version}.0/released.html>"
release_notes = "* <https://alpinelinux.org/posts/{release}/released.html"
"* <https://alpinelinux.org/posts/Alpine-{version}.0/released.html>"
release_notes = "* <https://alpinelinux.org/posts/Alpine-{release}/released.html>"
}
# initial provisioning script and data directory

View File

@ -1,6 +1,9 @@
# vim: ts=2 et:
name = [cloudinit]
# start cloudinit images with 3.15
EXCLUDE = ["3.12", "3.13", "3.14"]
packages {
cloud-init = true
openssh-server-pam = true

View File

@ -1,17 +1,31 @@
# vim: ts=2 et:
name = [tiny]
WHEN {
aws.packages.tiny-cloud-aws = true
# azure.packages.tiny-cloud-azure = true
# gcp.packages.tiny-cloud-gcp = true
# oci.packages.tiny-cloud-oci = true
}
services {
sysinit.tiny-cloud-early = true
default.tiny-cloud = true
default.tiny-cloud-final = true
}
WHEN {
aws {
packages.tiny-cloud-aws = true
WHEN {
"3.12" {
# tiny-cloud-network requires ifupdown-ng (unavailable in 3.12)
packages.tiny-cloud-aws = null
services.sysinit.tiny-cloud-early = null
services.default.tiny-cloud = null
services.default.tiny-cloud-final = null
# fall back to tiny-ec2-bootstrap instead
packages.tiny-ec2-bootstrap = true
services.default.tiny-ec2-bootstrap = true
}
}
}
# azure.packages.tiny-cloud-azure = true
# gcp.packages.tiny-cloud-gcp = true
# oci.packages.tiny-cloud-oci = true
}
scripts = [ setup-tiny ]

View File

@ -9,7 +9,13 @@ einfo() {
printf '\n\033[1;7;36m> %s <\033[0m\n' "$@" >&2 # bold reversed cyan
}
einfo "Configuring Tiny Cloud..."
sed -i.bak -Ee "s/^#?CLOUD_USER=.*/CLOUD_USER=$IMAGE_LOGIN/" \
"$TARGET"/etc/conf.d/tiny-cloud
rm "$TARGET"/etc/conf.d/tiny-cloud.bak
if [ "$VERSION" = "3.12" ]; then
# tiny-cloud-network requires ifupdown-ng, not in 3.12
einfo "Configuring Tiny EC2 Bootstrap..."
echo "EC2_USER=$IMAGE_LOGIN" > /etc/conf.d/tiny-ec2-bootstrap
else
einfo "Configuring Tiny Cloud..."
sed -i.bak -Ee "s/^#?CLOUD_USER=.*/CLOUD_USER=$IMAGE_LOGIN/" \
"$TARGET"/etc/conf.d/tiny-cloud
rm "$TARGET"/etc/conf.d/tiny-cloud.bak
fi