various bundles: fix dependencies
Some checks failed
kunsi/bundlewrap/pipeline/head There was a failure building this commit

This commit is contained in:
Sophie Schiller 2022-02-18 22:18:44 +01:00
parent 3455e6daa2
commit a01c28da21
4 changed files with 20 additions and 18 deletions

View file

@ -1,14 +1,6 @@
if node.has_bundle('pacman'):
package = 'pkg_pacman:lldpd'
else:
package = 'pkg_apt:lldpd'
directories = { directories = {
'/etc/lldpd.d': { '/etc/lldpd.d': {
'purge': True, 'purge': True,
'needs': {
package,
},
'triggers': { 'triggers': {
'svc_systemd:lldpd:restart', 'svc_systemd:lldpd:restart',
}, },
@ -18,9 +10,6 @@ directories = {
files = { files = {
'/etc/lldpd.conf': { '/etc/lldpd.conf': {
'delete': True, 'delete': True,
'needs': {
package,
},
}, },
'/etc/lldpd.d/bundlewrap.conf': { '/etc/lldpd.d/bundlewrap.conf': {
'content_type': 'mako', 'content_type': 'mako',
@ -34,7 +23,6 @@ svc_systemd = {
'lldpd': { 'lldpd': {
'needs': { 'needs': {
'file:/etc/lldpd.d/bundlewrap.conf', 'file:/etc/lldpd.d/bundlewrap.conf',
package,
}, },
}, },
} }

View file

@ -1,12 +1,24 @@
defaults = { defaults = {
'apt': { 'apt': {
'packages': { 'packages': {
'lldpd': {}, 'lldpd': {
'needed_by': [
'directory:/etc/lldpd.d',
'file:/etc/lldp.conf',
'svc_systemd:lldpd',
],
},
}, },
}, },
'pacman': { 'pacman': {
'packages': { 'packages': {
'lldpd': {}, 'lldpd': {
'needed_by': [
'directory:/etc/lldpd.d',
'file:/etc/lldp.conf',
'svc_systemd:lldpd',
],
},
}, },
}, },
} }

View file

@ -16,8 +16,5 @@ actions = {
svc_systemd = { svc_systemd = {
'nfs-server': { 'nfs-server': {
'needs': {
'pkg_apt:nfs-kernel-server',
},
}, },
} }

View file

@ -3,7 +3,12 @@ from bundlewrap.metadata import atomic
defaults = { defaults = {
'apt': { 'apt': {
'packages': { 'packages': {
'nfs-kernel-server': {} 'nfs-server': {
'needed_by': [
'svc_systemd:nfs-kernel-server',
'action:nfs_reload_shares',
],
},
}, },
}, },
} }