From d9bacc252c1f9fe22b0c20102355725fa42f69ff Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 27 Aug 2023 12:55:19 -0400 Subject: [PATCH 1/4] README: update --- README.md | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3b4146e..810a5fb 100644 --- a/README.md +++ b/README.md @@ -11,15 +11,8 @@ and packaged in an RPM that is installable by QubesOS. Alpine Linux as a QubesOS template is still a work and progress. It is highly encouraged to make bug reports. -#### The yet-to-be-implemented list -Thus the following use cases are still not supported / tested: - * QubesOS r4.2 - * Service VMs (sys-net, sys-usb, sys-firewall) - * Firewall (not tested) - * `qubes-builder` hooks (thus no `dom0` template RPM yet, see [here](https://gitlab.alpinelinux.org/ayakael/qubes-builder-alpine) for progress) - * `apk` proxying from within template (thus you must allow internet access to template to install packages) - * `qubes-vm-kernel-support` Not adapted for use on Alpine yet, due to it providing a Dracut module. In most cases, it is not necessary as Qubes provides the kernel. - This package is only neccessary when VM uses its own kernel, thus a hook is added to Dracut to generate the initrd for use within qubes. +### Known issues +Known issues are tracked on the upstream GitLab instance. #### Issues, recommendations and proposals **To report an issue or share a recommendation** From 7a5d71d1c0c41a2f951a3e8684aff057c22d4f19 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 7 Dec 2023 19:15:12 -0500 Subject: [PATCH 2/4] Use Alpine v3.19 --- .gitlab-ci.yml | 8 ++++---- builder.conf | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3776a47..f544914 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,10 +33,10 @@ variables: tags: - qubes-template -verify-alpine318: +verify-alpine319: extends: .verify variables: - CI_ALPINE_TARGET_RELEASE: alpine318 + CI_ALPINE_TARGET_RELEASE: alpine319 .build: stage: build @@ -75,10 +75,10 @@ verify-alpine318: tags: - qubes-template -build-alpine318: +build-alpine319: extends: .build variables: - CI_ALPINE_TARGET_RELEASE: alpine318 + CI_ALPINE_TARGET_RELEASE: alpine319 release: stage: release diff --git a/builder.conf b/builder.conf index e6f821c..0d5a3a0 100644 --- a/builder.conf +++ b/builder.conf @@ -23,7 +23,7 @@ GIT_PREFIX := QubesOS/qubes- # DISTS_VM - Choose the templates to build. Multiple templates can be defined # to build. Uncomment tempalte dist to build. -DISTS_VM := alpine318 +DISTS_VM := alpine319 COMPONENTS += builder-alpine BUILDER_PLUGINS += builder-alpine From 1bdec343ded23cab1f049bfc7b9419a6bcc68ac0 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 7 Dec 2023 20:16:14 -0500 Subject: [PATCH 3/4] scripts/04_install_qubes.sh: setup lo device --- scripts/04_install_qubes.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/04_install_qubes.sh b/scripts/04_install_qubes.sh index 1e69f66..bbeffbe 100755 --- a/scripts/04_install_qubes.sh +++ b/scripts/04_install_qubes.sh @@ -79,6 +79,13 @@ echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt220" >> "$INSTALLDIR"/etc/initt # create /lib/modules for qubes-kernel module mount "${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" mkdir /lib/modules +# lo device +cat > "${INSTALLDIR}/etc/network/interfaces" < Date: Thu, 8 Feb 2024 10:57:52 -0500 Subject: [PATCH 4/4] scripts/04_install_qubes.sh: autostart qubes-updates-proxy-forwarder for apk proxy --- scripts/04_install_qubes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/04_install_qubes.sh b/scripts/04_install_qubes.sh index bbeffbe..b7294a5 100755 --- a/scripts/04_install_qubes.sh +++ b/scripts/04_install_qubes.sh @@ -87,7 +87,7 @@ EOF # enable services -for i in udev udev-trigger xendriverdomain qubes-qrexec-agent qubes-db qubes-meminfo-writer qubes-sysinit qubes-core-early qubes-core qubes-gui-agent crond acpid; do +for i in udev udev-trigger xendriverdomain qubes-qrexec-agent qubes-db qubes-meminfo-writer qubes-sysinit qubes-core-early qubes-core qubes-gui-agent qubes-updates-proxy-forwarder crond acpid; do "${TEMPLATE_CONTENT_DIR}/alpine-chroot" "$INSTALLDIR" rc-update add $i default done for i in bootmisc hostname hwclock loadkmap modules networking seedrng swap sysctl syslog; do