Merge ~morphis/snappy-hwe-snaps/+git/wifi-ap:small-improvements into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

[Simon Fels]

Small improvements for default configuration and log output

* Use direct interface mode by default; this is the modem supported by most WiFi devices so lets make it the default rather than the not common virtual one.
* Always check if network-manager is available before trying to use to avoid unnecessary error messages

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:2028a66d94e88afa7a3a1b76fc24bfcb65a69e7a
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/115/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/16/console

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

review: Approve (continuous-integration)

[Matteo Croce (teknoraver)]

review: Approve

[Konrad Zapałowicz (kzapalowicz)]

LGTM

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

See comment below.

review: Needs Information

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

diff --git a/bin/ap.sh b/bin/ap.sh
index f017554..a7fba62 100755
--- a/bin/ap.sh
+++ b/bin/ap.sh
@@ -87,10 +87,14 @@ if [ "$WIFI_INTERFACE_MODE" = "direct" ] ; then
 	assert_not_managed_by_ifupdown $iface
 fi
 
-# Prevent network-manager from touching the interface we want to use. If
-# network-manager was configured to use the interface its nothing we want
-# to prevent here as this is how the user configured the system.
-$SNAP/bin/nmcli d set $iface managed no
+
+nm_status=`$SNAP/bin/nmcli -t -f RUNNING general`
+if [ "$nm_status" = "running" ] ; then
+	# Prevent network-manager from touching the interface we want to use. If
+	# network-manager was configured to use the interface its nothing we want
+	# to prevent here as this is how the user configured the system.
+	$SNAP/bin/nmcli d set $iface managed none
+fi
 
 # Initial wifi interface configuration
 ifconfig $iface up
@@ -102,10 +106,12 @@ if [ $? -ne 0 ] ; then
 		$SNAP/bin/iw dev $iface del
 	fi
 
-	# Hand interface back to network-manager. This will also trigger the
-	# auto connection process inside network-manager to get connected
-	# with the previous network.
-	$SNAP/bin/nmcli d set $iface managed yes
+	if [ "$nm_status" = "running" ] ; then
+		# Hand interface back to network-manager. This will also trigger the
+		# auto connection process inside network-manager to get connected
+		# with the previous network.
+		$SNAP/bin/nmcli d set $iface managed yes
+	fi
 
 	exit 1
 fi
diff --git a/conf/default-config b/conf/default-config
index 1fa5c4f..2bbf816 100644
--- a/conf/default-config
+++ b/conf/default-config
@@ -24,14 +24,14 @@ WIFI_INTERFACE=wlan0
 WIFI_ADDRESS=192.168.7.1
 WIFI_NETMASK=255.255.255.0
 
-# Possible options are: uap, direct
+# Possible options are: virtual, direct
 #   virtual:
 #     Creates a virtual network interface for the AP with
 #     the interface configured in $WIFI_INTERFACE as parent.
 #   direct:
 #     Will use the interface configured with $WIFI_INTERFACE
 #     directly.
-WIFI_INTERFACE_MODE=virtual
+WIFI_INTERFACE_MODE=direct
 
 # Possible options are: nl80211, rtl8188
 WIFI_HOSTAPD_DRIVER="nl80211"