diff --git a/bundles/pacman/files/pacman.conf b/bundles/pacman/files/pacman.conf index 39781b6..834108e 100644 --- a/bundles/pacman/files/pacman.conf +++ b/bundles/pacman/files/pacman.conf @@ -6,15 +6,11 @@ HoldPkg = ${' '.join(sorted(node.metadata.get('pacman/ask_before_removal')))} ILoveCandy IgnorePkg = ${' '.join(sorted(node.metadata.get('pacman/ignore_packages', set())))} LocalFileSigLevel = Optional +NoExtract=${' '.join(sorted(node.metadata.get('pacman/no_extract', set())))} ParallelDownloads = ${node.metadata.get('pacman/parallel_downloads')} SigLevel = Required DatabaseOptional VerbosePkgLists -# 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 -NoExtract=usr/lib/security/pam_systemd_home.so - % for line in sorted(node.metadata.get('pacman/additional_config', set())): ${line} % endfor diff --git a/bundles/pacman/metadata.py b/bundles/pacman/metadata.py index 401ffd1..19b2191 100644 --- a/bundles/pacman/metadata.py +++ b/bundles/pacman/metadata.py @@ -4,6 +4,12 @@ defaults = { 'glibc', 'pacman', }, + 'no_extract': { + # 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 + 'usr/lib/security/pam_systemd_home.so', + }, 'parallel_downloads': 4, 'repository': 'http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch', 'unattended-upgrades': { diff --git a/nodes/kunsi-p14s.py b/nodes/kunsi-p14s.py index 50151f9..546d052 100644 --- a/nodes/kunsi-p14s.py +++ b/nodes/kunsi-p14s.py @@ -74,6 +74,9 @@ nodes['kunsi-p14s'] = { }, 'pacman': { 'linux-lts': True, + 'no_extract': { + 'etc/sudoers.d/ctdb', # samba junk + }, 'packages': { # for hardware support 'amd-ucode': {}, @@ -101,6 +104,7 @@ nodes['kunsi-p14s'] = { 'mosquitto': {}, 'perl-musicbrainz-discid': {}, # for abcde 'perl-webservice-musicbrainz': {}, # for abcde + 'samba': {}, 'xf86-input-wacom': {}, }, },