NetworkManager

Merge ~jbicha/network-manager:master into network-manager:master

  1. Git
  2. lp:~jbicha/network-manager
  3. master
  4. Merge into master
Proposed by Jeremy Bícha
Status: Rejected
Rejected by: Jeremy Bícha
Proposed branch: ~jbicha/network-manager:master
Merge into: network-manager:master
Diff against target: 64 lines (+29/-0)
4 files modified
debian/20-connectivity.conf (+3/-0)
debian/changelog (+9/-0)
debian/control (+16/-0)
debian/network-manager-config-connectivity.install (+1/-0)
Reviewer Review Type Date Requested Status
Aron Xu Needs Information
Review via email: mp+318031@code.launchpad.net

Description of the change

By adding a separate package for this config snippet, it enables Ubuntu flavors to easily opt into the NetworkManager connectivity status check by recommending this package. Ubuntu users can easily override the default by installing or uninstalling this package.

I will be proposing this for zesty Feature Freeze Exception and I will bring it up for discussion on the ubuntu-devel list, so let's wait to merge until we get approval.

To post a comment you must log in.
Revision history for this message
Matteo Croce (teknoraver) :
Revision history for this message
Aron Xu (happyaron) wrote :

I have a few questions:

1. Whether the 5-minute checks will congest Canonical's web servers? Or local network operators may see a lot of Ubuntu desktops flooding the same request so frequently.

2. How to deal with caches? Google uses HTTPS + 204 response code, and Apple uses HTTPS + text file. The approach we are using is more likely to the latter one, but it does not support HTTPS.

review: Needs Information
Revision history for this message
Jeremy Bícha (jbicha) wrote :

Aron, could you ask someone in Canonical's web development about your first question?

I think this will have zero affect on other network operators. (All the other major operating systems do basically the same thing and almost anything else that uses the web will have a bigger effect.)

I don't know anything about #2. I think generally these network-connectivity-check URLs use http because there are problems with trying to ping a https server with a captive portal.

Also, could you maybe bring up your concerns on the ubuntu-devel list thread I started so that more people will see?

Revision history for this message
Jeremy Bícha (jbicha) wrote :

There are many other URIs that work. Some I know of are:

http://network-test.debian.org/nm
http://nmcheck.gnome.org/check_network_status.txt
http://fedoraproject.org/static/hotspot.txt (redirects to HTTPS, Fedora has set response to "OK")
http://www.pkgbuild.com/check_network_status.txt (Arch Linux, redirects to HTTPS)

I think it would be preferable for it to be Canonical-hosted though.

Revision history for this message
Saurav Sengupta (sauravsengupta) wrote :

Does that Lorem ipsum response for the uri in this proposal work? It didn't work for me on Ubuntu GNOME 16.10 (the login popup appeared with the root page open for nmcheck.gnome.org). I think it should be something like response=<!DOCTYPE HTML PUBLIC for uri=http://start.ubuntu.com/connectivity-check.html (see https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/997200/comments/4) because it checks from the beginning of the body content, not the rendered text; or else change the uri.

~jbicha/network-manager:master updated
fe4efd3... by Jeremy Bícha

Temporarily set URI to Debian's until a working Ubuntu one is set up

Revision history for this message
Jeremy Bícha (jbicha) wrote :

Saurav, thanks for the feedback. Yes, I see that the start.ubuntu.com URI does not work. I am going to see if I can find someone at Canonical that can set up one that works. Meanwhile, I'll set the URI to Debian's which I did test.

You also saw something else because gnome-shell hardcodes a nmcheck.gnome.org URI which I think we'll want to patch out:
https://git.gnome.org/browse/gnome-shell/tree/js/portalHelper/main.js#n28

Revision history for this message
Saurav Sengupta (sauravsengupta) wrote :

A bit off-topic here, but if you're going to patch the portal helper, could you also see if the window can be made to remain in the background (perhaps insert a set_keep_below call (https://developer.gnome.org/gtk3/stable/GtkWindow.html#gtk-window-set-keep-below) before the present_with_time call on line #165)? Sorry if this seems ignorant, but I don't have good knowledge of GTK+.

Revision history for this message
Jeremy Bícha (jbicha) wrote :

This has been merged in, similarly but slightly differently in Artful and Debian unstable.

Unmerged commits

fe4efd3... by Jeremy Bícha

Temporarily set URI to Debian's until a working Ubuntu one is set up

a274d13... by Jeremy Bícha

Add network-manager-connectivity-config package

* Add network-manager-connectivity-config package (LP: #997200)
  - Install this if you want NetworkManager to check on connection and
    every 5 minutes afterwards whether the network you are connected to
    is actually connected to the Internet.

b2bcc9a... by Barry Warsaw

Release

c86a11b... by Barry Warsaw

Cherry-pick back 98974a88 and 47c16e59

74f78d0... by Martin Pitt

Disable resolvconf support

This is broken with DNS plugins other than "dnsmasq" -- it still writes
127.0.1.1 into resolvconf as a nameserver, but this does not exist any more and
will also shadow resolved's stub server on 127.0.0.53.

This ought to be fixed more properly in the future.

0daf8f8... by Martin Pitt

Re-drop dnsmasq in zesty, in favor of systemd-resolved

But don't Recommend libnss-resolve, because the local resolver + libnss_dns.so
should suffice for all uses and the resolved nss module is unnecessary added
complexity.

We need to specify "dns=systemd-resolved" as for the time being our
/etc/resolv.conf points to resolvconf's generated file instead of
systemd-resolved's, so the auto-detection does not work. Do that in a separate
conf.d file in /usr to avoid unnecessary conffile prompts in the future. The
user can still override it in /etc.

LP: #1638836

1564f7d... by Barry Warsaw

Applying release details.

4a73ffc... by Mathieu Trudel-Lapierre

debian/tests/network_test_base.py: handle iw 4.9 change

handle iw 4.9 which may qualify the regulatory domain information with 'global'
in some cases, depending on the test environment.

80710c3... by Aron Xu

Update changelog entry

a57df67... by Aron Xu

Refresh patches, dropping ones that are included upstream

 * manager-fix-state-transition-on-resuming-from-sleep.patch
 * wifi-notify-the-AccessPoint-change-after-an-AP-is-removed.patch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/20-connectivity.conf b/debian/20-connectivity.conf
0new file mode 1006440new file mode 100644
index 0000000..58446fb
--- /dev/null
+++ b/debian/20-connectivity.conf
@@ -0,0 +1,3 @@
1[connectivity]
2uri=http://start.ubuntu.com/connectivity-check.html
3response=Lorem ipsum
diff --git a/debian/changelog b/debian/changelog
index d211287..25f9d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1network-manager (1.4.4-1ubuntu3) UNRELEASED; urgency=medium
2
3 * Add network-manager-connectivity-config package (LP: #997200)
4 - Install this if you want NetworkManager to check on connection and
5 every 5 minutes afterwards whether the network you are connected to
6 is actually connected to the Internet.
7
8 -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 22 Feb 2017 11:38:33 -0500
9
1network-manager (1.4.4-1ubuntu2) zesty; urgency=medium10network-manager (1.4.4-1ubuntu2) zesty; urgency=medium
211
3 * Cherry-pick back 98974a88 and 47c16e59 (network-manager switching from12 * Cherry-pick back 98974a88 and 47c16e59 (network-manager switching from
diff --git a/debian/control b/debian/control
index f1798bb..4914cc8 100644
--- a/debian/control
+++ b/debian/control
@@ -70,6 +70,7 @@ Recommends: ppp (>= 2.4.6),
70 network-manager-gnome | plasma-widget-networkmanagement | plasma-nm,70 network-manager-gnome | plasma-widget-networkmanagement | plasma-nm,
71 modemmanager | ofono,71 modemmanager | ofono,
72Suggests: avahi-autoipd,72Suggests: avahi-autoipd,
73 network-manager-config-connectivity,
73 python,74 python,
74Breaks: network-manager-gnome (<< 0.9),75Breaks: network-manager-gnome (<< 0.9),
75 network-manager-openvpn (<< 0.9),76 network-manager-openvpn (<< 0.9),
@@ -266,3 +267,18 @@ Description: GObject introspection data for NetworkManager
266 It can be used by packages using the GIRepository format to generate267 It can be used by packages using the GIRepository format to generate
267 dynamic bindings.268 dynamic bindings.
268269
270Package: network-manager-config-connectivity
271Architecture: all
272Multi-Arch: foreign
273Depends: ${misc:Depends}
274Description: network management framework (connectivity config)
275 NetworkManager is a system network service that manages your network devices
276 and connections, attempting to keep active network connectivity when
277 available. It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE
278 devices, and provides VPN integration with a variety of different VPN
279 services.
280 .
281 This package provides the config snippet to enable NetworkManager to
282 automatically check whether the active network connection is actually
283 connected to the Internet. By default, this check happens every 5 minutes.
284 This package can be uninstalled if this feature is not wanted.
diff --git a/debian/network-manager-config-connectivity.install b/debian/network-manager-config-connectivity.install
269new file mode 100644285new file mode 100644
index 0000000..ad61360
--- /dev/null
+++ b/debian/network-manager-config-connectivity.install
@@ -0,0 +1 @@
1debian/20-connectivity.conf /usr/lib/NetworkManager/conf.d/

Subscribers

People subscribed via source and target branches

to all changes: