From 8cc116c0c4419eb3ae33d7d3bd32a26e27f54aa4 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 30 Apr 2022 12:30:32 +0200 Subject: [PATCH] bundles/zfs: respect pacman/linux-lts option --- bundles/zfs/metadata.py | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/bundles/zfs/metadata.py b/bundles/zfs/metadata.py index 6bd15a8..28bbc28 100644 --- a/bundles/zfs/metadata.py +++ b/bundles/zfs/metadata.py @@ -50,12 +50,6 @@ defaults = { }, 'pacman': { 'packages': { - 'zfs-linux-lts': { - 'needed_by': { - 'zfs_dataset:', - 'zfs_pool:', - }, - }, 'zfs-utils': { 'needed_by': { 'svc_systemd:zfs-zed', @@ -129,6 +123,28 @@ 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', )