diff --git a/debian/changelog b/debian/changelog index d3625bba3..0dcc4b6b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ systemd (227-4) UNRELEASED; urgency=medium [ Martin Pitt ] * debian/rules: Configure with --as-needed to avoid unnecessary binary dependencies. + * systemd-networkd-resolvconf-update.service: Increase StartLimitBurst, as + this might be legitimately called several times in quick succession. If + that part of the "networkd" autopkgtest fails, show the journal log for + that service for easier debugging. [ Felipe Sateler ] * Enable elfutils support for getting stack traces for systemd-coredump. diff --git a/debian/extra/units/systemd-networkd-resolvconf-update.service b/debian/extra/units/systemd-networkd-resolvconf-update.service index 2fdbb969d..407fbb2ba 100644 --- a/debian/extra/units/systemd-networkd-resolvconf-update.service +++ b/debian/extra/units/systemd-networkd-resolvconf-update.service @@ -6,6 +6,7 @@ After=resolvconf.service [Service] Type=oneshot +DefaultStartLimitBurst=20 # we need to wait for "online" here, as we might be triggered several times in short succession during restarting networkd ExecStart=/bin/sh -c 'if /lib/systemd/systemd-networkd-wait-online --timeout=30; then sed -n "/^DNS=/ { s/^DNS=/nameserver /; p}" /run/systemd/netif/state | /sbin/resolvconf -a networkd; fi' diff --git a/debian/tests/networkd b/debian/tests/networkd index 1c33f328e..0e3767094 100755 --- a/debian/tests/networkd +++ b/debian/tests/networkd @@ -142,6 +142,7 @@ DHCP=yes''' % self.iface) break time.sleep(0.1) else: + subprocess.call(['journalctl', '-b', '-u', 'systemd-networkd-resolvconf-update.service']) self.fail('nameserver 192.168.5.1 not found in /etc/resolv.conf') if not coldplug: