snappy-hwe-snaps

Merge ~morphis/snappy-hwe-snaps/+git/wifi-ap:fix-nm-managed into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

  1. Git
  2. lp:~morphis/snappy-hwe-snaps/+git/wifi-ap
  3. fix-nm-managed
  4. Merge into master
Proposed by Simon Fels
Status: Merged
Approved by: Tony Espy
Approved revision: c7887f5ccd0c9d080a6cb5b2052426db68582856
Merged at revision: 2a46265e532ddcfc10701d380cdc640492ce80e4
Proposed branch: ~morphis/snappy-hwe-snaps/+git/wifi-ap:fix-nm-managed
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master
Diff against target: 13 lines (+1/-1)
1 file modified
bin/ap.sh (+1/-1)
Reviewer Review Type Date Requested Status
Tony Espy Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+307832@code.launchpad.net

Description of the change

Use "no" rather than "none" to mark a device as not managed

Actually a mistake in the implementation.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:c7887f5ccd0c9d080a6cb5b2052426db68582856
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/171/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/73/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/171/rebuild

review: Approve (continuous-integration)
Revision history for this message
Tony Espy (awe) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/bin/ap.sh b/bin/ap.sh
2index a7fba62..6c26b30 100755
3--- a/bin/ap.sh
4+++ b/bin/ap.sh
5@@ -93,7 +93,7 @@ if [ "$nm_status" = "running" ] ; then
6 # Prevent network-manager from touching the interface we want to use. If
7 # network-manager was configured to use the interface its nothing we want
8 # to prevent here as this is how the user configured the system.
9- $SNAP/bin/nmcli d set $iface managed none
10+ $SNAP/bin/nmcli d set $iface managed no
11 fi
12
13 # Initial wifi interface configuration

Subscribers

People subscribed via source and target branches

to all changes: