Merge lp://staging/~phablet-team/network-manager/lp1435776-wily into lp://staging/~network-manager/network-manager/ubuntu

Proposed by Tony Espy
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 967
Merged at revision: 967
Proposed branch: lp://staging/~phablet-team/network-manager/lp1435776-wily
Merge into: lp://staging/~network-manager/network-manager/ubuntu
Diff against target: 82 lines (+12/-24)
2 files modified
debian/changelog (+9/-0)
debian/patches/add_ofono_settings_support.patch (+3/-24)
To merge this branch: bzr merge lp://staging/~phablet-team/network-manager/lp1435776-wily
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email:

Description of the change

This change affects the ofono settings plugin and the way that it configures system connections based on ofono gprs_contexts ( aka APNs ).

The change removes the addition of USERNAME and PASSWORD NM_SETTING_GSM settings to the connection, as they're not needed by network-manager, and can cause secret-related activation errors.

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks good; let's just merge the patch in to the ofono settings patch, so that things can be more easily upstreamed. Separate patch is fine for SRU purposes, but I don't think this is relevant to SRU.

review: Approve
967. By Tony Espy

debian/patches/add_ofono_settings_support.patch: remove code
that added APN, USERNAME and PASSWORD to NM_SETTING_GSM object.
NM doesn't actually need access to these settings, and USERNAME/
PASSWORD can cause issues with NM's secrets needed logic.

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Rockin'. Full ack, I will merge this in the morning (but if I forget don't hesitate to remind me).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches