bundles/pacman: make NoExtract user-configurable
All checks were successful
kunsi/bundlewrap/pipeline/head This commit looks good

This commit is contained in:
Franzi 2022-04-22 15:47:47 +02:00
parent 8145fb22e8
commit 74b3a513f6
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 11 additions and 5 deletions

View file

@ -6,15 +6,11 @@ HoldPkg = ${' '.join(sorted(node.metadata.get('pacman/ask_before_removal')))}
ILoveCandy ILoveCandy
IgnorePkg = ${' '.join(sorted(node.metadata.get('pacman/ignore_packages', set())))} IgnorePkg = ${' '.join(sorted(node.metadata.get('pacman/ignore_packages', set())))}
LocalFileSigLevel = Optional LocalFileSigLevel = Optional
NoExtract=${' '.join(sorted(node.metadata.get('pacman/no_extract', set())))}
ParallelDownloads = ${node.metadata.get('pacman/parallel_downloads')} ParallelDownloads = ${node.metadata.get('pacman/parallel_downloads')}
SigLevel = Required DatabaseOptional SigLevel = Required DatabaseOptional
VerbosePkgLists 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())): % for line in sorted(node.metadata.get('pacman/additional_config', set())):
${line} ${line}
% endfor % endfor

View file

@ -4,6 +4,12 @@ defaults = {
'glibc', 'glibc',
'pacman', '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, 'parallel_downloads': 4,
'repository': 'http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch', 'repository': 'http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch',
'unattended-upgrades': { 'unattended-upgrades': {

View file

@ -74,6 +74,9 @@ nodes['kunsi-p14s'] = {
}, },
'pacman': { 'pacman': {
'linux-lts': True, 'linux-lts': True,
'no_extract': {
'etc/sudoers.d/ctdb', # samba junk
},
'packages': { 'packages': {
# for hardware support # for hardware support
'amd-ucode': {}, 'amd-ucode': {},
@ -101,6 +104,7 @@ 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
'samba': {},
'xf86-input-wacom': {}, 'xf86-input-wacom': {},
}, },
}, },