kunsi/bundlewrap
1
0
Fork 0
Code Issues 2 Pull requests 1 Releases Activity

Compare commits

base: kunsi:15b97d0edd9ea388166fb92a272b6108e7cc79ac
Branches Tags
kunsi:main
kunsi:feature/kunsi-ipv6-only-vlan
kunsi:jhtoolz
kunsi:sophie-dimension-cleanup
kunsi:kunsi-woodpecker
kunsi:kunsi-junos
kunsi:loudness-monitoring-gstreamer
..
compare: kunsi:12e21d893f553bd65f14d8323bff180a692fc55b
Branches Tags
kunsi:main
kunsi:feature/kunsi-ipv6-only-vlan
kunsi:jhtoolz
kunsi:sophie-dimension-cleanup
kunsi:kunsi-woodpecker
kunsi:kunsi-junos
kunsi:loudness-monitoring-gstreamer

No commits in common. "15b97d0edd9ea388166fb92a272b6108e7cc79ac" and "12e21d893f553bd65f14d8323bff180a692fc55b" have entirely different histories.
15b97d0edd ... 12e21d893f

2 changed files with 16 additions and 31 deletions
Show stats Expand all files Collapse all files

28
bundles/zfs/metadata.py
View file

@ -50,6 +50,12 @@ defaults = {
},
'pacman': {
'packages': {
'zfs-linux-lts': {
'needed_by': {
'zfs_dataset:',
'zfs_pool:',
},
},
'zfs-utils': {
'needed_by': {
'svc_systemd:zfs-zed',
@ -123,28 +129,6 @@ if node.has_bundle('telegraf'):
}
@metadata_reactor.provides(
'pacman/packages',
)
def packages(metadata):
if node.metadata.get('pacman/linux-lts', False):
pkgname = 'zfs-linux-lts'
else:
pkgname = 'zfs-linux'
return {
'pacman': {
'packages': {
pkgname: {
'needed_by': {
'zfs_dataset:',
'zfs_pool:',
},
},
},
},
}
@metadata_reactor.provides(
'systemd-timers/timers/zfs-scrub',
)

19
nodes/kunsi-p14s.py
View file

@ -70,6 +70,7 @@ nodes['kunsi-p14s'] = {
},
},
'pacman': {
'linux-lts': True,
'no_extract': {
'etc/sudoers.d/ctdb', # samba junk
},
@ -113,25 +114,25 @@ nodes['kunsi-p14s'] = {
},
},
'systemd-boot': {
'default': 'arch',
'default': 'arch-lts',
'entries': {
'arch': {
'title': 'Arch Linux',
'linux': '/vmlinuz-linux',
'arch-lts': {
'title': 'Arch Linux (LTS kernel)',
'linux': '/vmlinuz-linux-lts',
'initrd': [
'/amd-ucode.img',
'/initramfs-linux.img',
'/initramfs-linux-lts.img',
],
'options': {
'zfs=zroot/system/root',
'rw',
},
},
'arch-fallback': {
'title': 'Arch Linux (no ucode, fallback initramfs)',
'linux': '/vmlinuz-linux',
'arch-lts-fallback': {
'title': 'Arch Linux (LTS kernel, no ucode, fallback initramfs)',
'linux': '/vmlinuz-linux-lts',
'initrd': [
'/initramfs-linux-fallback.img',
'/initramfs-linux-lts-fallback.img',
],
'options': {
'zfs=zroot/system/root',