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/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** 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 diff --git a/scripts/04_install_qubes.sh b/scripts/04_install_qubes.sh index 1e69f66..b7294a5 100755 --- a/scripts/04_install_qubes.sh +++ b/scripts/04_install_qubes.sh @@ -79,8 +79,15 @@ 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" <