Skip to content

Commit 8a0c7dd

Browse files
committed
Install netbase for /etc/services on Ubuntu 20.04
On Ubuntu 20.04 only the nftables package no longer depends on netbase. The result is the required `/etc/services` file is not installed. Always install `netbase` on Ubuntu 20.04
1 parent 02d6e88 commit 8a0c7dd

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

manifests/init.pp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,13 @@
159159
ensure => installed,
160160
}
161161

162+
# /etc/services file is needed, on newer OSes this is a dependency on nftables
163+
if $facts['os']['name'] == 'Ubuntu' and $facts['os']['release']['major'] == '20.04' {
164+
package { 'netbase':
165+
ensure => present,
166+
}
167+
}
168+
162169
if $clobber_default_config {
163170
file { $configuration_path:
164171
ensure => file,

spec/classes/nftables_spec.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@
3333

3434
it { is_expected.to contain_package('nftables') }
3535

36+
case [os_facts[:os]['name'], os_facts[:os]['release']['major']]
37+
when ['Ubuntu', '20.04']
38+
it { is_expected.to contain_package('netbase') }
39+
else
40+
it { is_expected.not_to contain_package('netbase') }
41+
end
42+
3643
context 'with clobber_default_config false' do
3744
let(:params) do
3845
{ clobber_default_config: false }

0 commit comments

Comments
 (0)