bundles/vmhost: prepare for arch linux
Some checks failed
kunsi/bundlewrap/pipeline/head There was a failure building this commit

This commit is contained in:
Franzi 2022-03-11 13:58:38 +01:00
parent 29f7aef27a
commit 757f1cb3cd
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 30 additions and 3 deletions

View file

@ -4,10 +4,10 @@ files = {
}, },
} }
if node.has_bundle('nftables'): if node.has_bundle('nftables') and node.has_bundle('apt'):
# libvirt on debian depends on either iptables or firewalld. Since # libvirt on debian depends on either iptables or firewalld. Since
# we're managing firewall rules using bundlewrap, we don't want either # we're managing firewall rules using bundlewrap, we don't want either
# of thos to interfere. So we install firewalld, then ensure it is # of those to interfere. So we install firewalld, then ensure it is
# never running. After that, we ensure the bundlewrap managed rules # never running. After that, we ensure the bundlewrap managed rules
# are active. # are active.
svc_systemd['firewalld'] = { svc_systemd['firewalld'] = {
@ -24,3 +24,9 @@ if node.has_bundle('nftables'):
'svc_systemd:nftables:reload', 'svc_systemd:nftables:reload',
}, },
} }
if node.has_bundle('pacman'):
svc_systemd['libvirtd'] = {}
svc_systemd['virtlogd'] = {
'enabled': None, # triggered via .socket
}

View file

@ -21,6 +21,12 @@ defaults = {
}, },
}, },
}, },
'pacman': {
'packages': {
'libvirt': {},
'qemu-headless': {},
},
},
} }
if node.os == 'debian' and node.os_version[0] < 11: if node.os == 'debian' and node.os_version[0] < 11:
@ -36,6 +42,9 @@ if node.has_bundle('nftables'):
}, },
} }
if node.has_bundle('arch-with-gui'):
defaults['pacman']['packages']['virt-manager'] = {}
@metadata_reactor.provides( @metadata_reactor.provides(
'users', 'users',

View file

@ -8,6 +8,7 @@ nodes['kunsi-p14s'] = {
'nfs-client', 'nfs-client',
'systemd-boot', 'systemd-boot',
'telegraf-battery-usage', 'telegraf-battery-usage',
'vmhost',
'zfs', 'zfs',
}, },
'groups': { 'groups': {
@ -92,7 +93,6 @@ nodes['kunsi-p14s'] = {
'mosquitto': {}, 'mosquitto': {},
'perl-musicbrainz-discid': {}, # for abcde 'perl-musicbrainz-discid': {}, # for abcde
'perl-webservice-musicbrainz': {}, # for abcde 'perl-webservice-musicbrainz': {}, # for abcde
'virt-manager': {},
'xf86-input-wacom': {}, 'xf86-input-wacom': {},
}, },
}, },
@ -149,10 +149,22 @@ nodes['kunsi-p14s'] = {
# this is not a complete list, but we can't create that # this is not a complete list, but we can't create that
# structure using bundlewrap anyway, so there's no point # structure using bundlewrap anyway, so there's no point
# in adding it here. # in adding it here.
'zroot': {
'compression': 'lz4',
'relatime': 'on',
'xattr': 'sa',
# encryption is enabled, too.
},
'zroot/system/journal': { 'zroot/system/journal': {
'mountpoint': '/var/log/journal', 'mountpoint': '/var/log/journal',
'acltype': 'posix', 'acltype': 'posix',
}, },
'zroot/system/libvirt': {
'mountpoint': '/var/lib/libvirt',
'needed_by': {
'bundle:vmhost',
},
},
'zroot/system/root': { 'zroot/system/root': {
'canmount': 'noauto', 'canmount': 'noauto',
'mountpoint': '/', 'mountpoint': '/',