mirror of
https://github.com/token2/snapd.git
synced 2026-03-13 11:15:47 -07:00
tests: work around broken update of systemd-networkd
New systemd has hit Groovy and upgrading causes networking problems. Detect the faulty upgrade and work around it. Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966612 Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
This commit is contained in:
@@ -397,11 +397,26 @@ prepare_project() {
|
||||
esac
|
||||
|
||||
restart_logind=
|
||||
restart_networkd=
|
||||
if [ "$(systemctl --version | awk '/systemd [0-9]+/ { print $2 }')" -lt 246 ]; then
|
||||
restart_logind=maybe
|
||||
restart_networkd=maybe
|
||||
fi
|
||||
|
||||
install_pkg_dependencies
|
||||
|
||||
# Try installing package dependencies. Because we pull in some systemd
|
||||
# development packages we can easily pull in a whole systemd upgrade. Most
|
||||
# of the time that's okay but, well, not always.
|
||||
if ! install_pkg_dependencies; then
|
||||
# If this failed, maybe systemd-networkd got busted during the 245-246
|
||||
# upgrade? If so we can just restart it and try again.
|
||||
# This is related to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966612
|
||||
if [ "$restart_networkd" = maybe ]; then
|
||||
systemctl reset-failed systemd-networkd.service
|
||||
systemctl try-restart systemd-networkd.service
|
||||
install_pkg_dependencies
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$restart_logind" = maybe ]; then
|
||||
if [ "$(systemctl --version | awk '/systemd [0-9]+/ { print $2 }')" -ge 246 ]; then
|
||||
|
||||
Reference in New Issue
Block a user