diff -Nru network-manager-1.4.4/debian/changelog network-manager-1.4.4/debian/changelog --- network-manager-1.4.4/debian/changelog 2017-03-23 12:40:01.000000000 +0000 +++ network-manager-1.4.4/debian/changelog 2017-05-16 04:35:15.000000000 +0000 @@ -1,3 +1,11 @@ +network-manager (1.4.4-1ubuntu3.1) zesty; urgency=medium + + * The fix for LP #1569649 did not re-enable NetworkManager-wait-online on + systems where it had been disabled in the packaging. Include a one-time + postinst fixup to correct this. LP: #1690992. + + -- Steve Langasek Mon, 15 May 2017 21:35:15 -0700 + network-manager (1.4.4-1ubuntu3) zesty; urgency=medium [ Rico Tzschichholz ] diff -Nru network-manager-1.4.4/debian/network-manager.postinst network-manager-1.4.4/debian/network-manager.postinst --- network-manager-1.4.4/debian/network-manager.postinst 2017-03-23 12:40:01.000000000 +0000 +++ network-manager-1.4.4/debian/network-manager.postinst 2017-05-16 04:35:15.000000000 +0000 @@ -63,3 +63,13 @@ #DEBHELPER# +if dpkg --compare-versions "$2" lt-nl 1.4.4-1ubuntu3.1~; then + # fix-up for LP: #1569649; this was fixed in the packaging, but + # if the service had been disabled on the system we never undid this + # on upgrade. Unfortunately we can't tell the difference, at this + # distance, between a service that's accidentally not been enabled by + # the packaging and one that's been deliberately disabled by the + # admin; but one of these scenarios is vastly more likely than the + # other. + systemctl enable NetworkManager-wait-online.service +fi