From 51c9506a19019efa7f037fc5cb01c07aef008aa1 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Mon, 16 May 2022 10:52:14 +0200
Subject: [PATCH] move pacman/no_extract to bundle metadata defaults

---
 bundles/pacman/metadata.py | 1 +
 bundles/zfs/metadata.py    | 3 +++
 nodes/kunsi-p14s.py        | 2 --
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bundles/pacman/metadata.py b/bundles/pacman/metadata.py
index 19b2191..fb69a04 100644
--- a/bundles/pacman/metadata.py
+++ b/bundles/pacman/metadata.py
@@ -5,6 +5,7 @@ defaults = {
             'pacman',
         },
         'no_extract': {
+            'etc/cron.d/0hourly',
             # don't install systemd-homed pam module. It produces a lot of spam in
             # journal about systemd-homed not being active, so just get rid of it.
             # Requires reinstall of systemd package, though
diff --git a/bundles/zfs/metadata.py b/bundles/zfs/metadata.py
index 28bbc28..0ff81c8 100644
--- a/bundles/zfs/metadata.py
+++ b/bundles/zfs/metadata.py
@@ -49,6 +49,9 @@ defaults = {
         },
     },
     'pacman': {
+        'no_extract': {
+            'etc/sudoers.d/zfs',
+        },
         'packages': {
             'zfs-utils': {
                 'needed_by': {
diff --git a/nodes/kunsi-p14s.py b/nodes/kunsi-p14s.py
index ba3982b..71e7336 100644
--- a/nodes/kunsi-p14s.py
+++ b/nodes/kunsi-p14s.py
@@ -71,9 +71,7 @@ nodes['kunsi-p14s'] = {
         },
         'pacman': {
             'no_extract': {
-                'etc/cron.d/0hourly',
                 'etc/sudoers.d/ctdb', # samba junk
-                'etc/sudoers.d/zfs',
             },
             'packages': {
                 # for hardware support