From a3e16b3920d8eeb6eec3b3937b0f2f4b55d703fa Mon Sep 17 00:00:00 2001
From: mezzarobba <mm@mezzarobba.net>
Date: Tue, 1 May 2018 14:49:37 +0200
Subject: [PATCH] [fix] make wifi control work with my Kobo Touch N905 (#3920)

---
 frontend/device/generic/device.lua | 2 +-
 frontend/device/kobo/device.lua    | 2 +-
 platform/kobo/disable-wifi.sh      | 2 +-
 platform/kobo/enable-wifi.sh       | 6 +++---
 platform/kobo/obtain-ip.sh         | 2 +-
 platform/kobo/release-ip.sh        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/device/generic/device.lua b/frontend/device/generic/device.lua
index 2289563c9..4cbef094c 100644
--- a/frontend/device/generic/device.lua
+++ b/frontend/device/generic/device.lua
@@ -199,7 +199,7 @@ function Device:retrieveNetworkInfo()
     if std_out then
         local result = std_out:read("*all")
         std_out:close()
-        std_out = io.popen('iwconfig eth0 | grep ESSID | cut -d\\" -f2')
+        std_out = io.popen('2>/dev/null iwconfig | grep ESSID | cut -d\\" -f2')
         if std_out then
             local ssid = std_out:read("*all")
             result = result .. "SSID: " .. ssid:gsub("(.-)%s*$", "%1") .. "\n"
diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua
index 6c31fdc33..9ea78da04 100644
--- a/frontend/device/kobo/device.lua
+++ b/frontend/device/kobo/device.lua
@@ -237,7 +237,7 @@ function Kobo:initNetworkManager(NetworkMgr)
     end
 
     NetworkMgr:setWirelessBackend(
-        "wpa_supplicant", {ctrl_interface = "/var/run/wpa_supplicant/eth0"})
+        "wpa_supplicant", {ctrl_interface = "/var/run/wpa_supplicant/" .. os.getenv("INTERFACE")})
 
     function NetworkMgr:obtainIP()
         os.execute("./obtain-ip.sh")
diff --git a/platform/kobo/disable-wifi.sh b/platform/kobo/disable-wifi.sh
index e4f11aec9..6e8cffc8a 100755
--- a/platform/kobo/disable-wifi.sh
+++ b/platform/kobo/disable-wifi.sh
@@ -5,7 +5,7 @@
 killall udhcpc default.script wpa_supplicant 2>/dev/null
 
 [ "${WIFI_MODULE}" != "8189fs" ] && wlarm_le -i eth0 down
-ifconfig eth0 down
+ifconfig "${INTERFACE}" down
 
 # Some sleep in between may avoid system getting hung
 # (we test if a module is actually loaded to avoid unneeded sleeps)
diff --git a/platform/kobo/enable-wifi.sh b/platform/kobo/enable-wifi.sh
index d9e685a63..613bff5ce 100755
--- a/platform/kobo/enable-wifi.sh
+++ b/platform/kobo/enable-wifi.sh
@@ -8,9 +8,9 @@ lsmod | grep -q "${WIFI_MODULE}" || insmod "${WIFI_MODULE_PATH}"
 # Race-y as hell, don't try to optimize this!
 sleep 1
 
-ifconfig eth0 up
-[ "$WIFI_MODULE" != "8189fs" ] && wlarm_le -i eth0 up
+ifconfig "${INTERFACE}" up
+[ "$WIFI_MODULE" != "8189fs" ] && wlarm_le -i "${INTERFACE}" up
 
 pidof wpa_supplicant >/dev/null \
     || env -u LD_LIBRARY_PATH \
-        wpa_supplicant -D wext -s -i eth0 -O /var/run/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B
+        wpa_supplicant -D wext -s -i "${INTERFACE}" -O /var/run/wpa_supplicant -c /etc/wpa_supplicant/wpa_supplicant.conf -B
diff --git a/platform/kobo/obtain-ip.sh b/platform/kobo/obtain-ip.sh
index 83842776e..0bd2fe731 100755
--- a/platform/kobo/obtain-ip.sh
+++ b/platform/kobo/obtain-ip.sh
@@ -3,4 +3,4 @@
 ./release-ip.sh
 
 # Use udhcpc to obtain IP.
-env -u LD_LIBRARY_PATH udhcpc -S -i eth0 -s /etc/udhcpc.d/default.script -t15 -T10 -A3 -b -q
+env -u LD_LIBRARY_PATH udhcpc -S -i "${INTERFACE}" -s /etc/udhcpc.d/default.script -t15 -T10 -A3 -b -q
diff --git a/platform/kobo/release-ip.sh b/platform/kobo/release-ip.sh
index d57e8d139..4dcc083d0 100755
--- a/platform/kobo/release-ip.sh
+++ b/platform/kobo/release-ip.sh
@@ -5,4 +5,4 @@ export PATH="${PATH}:/sbin"
 
 # Release IP and shutdown udhcpc.
 pkill -9 -f '/bin/sh /etc/udhcpc.d/default.script'
-ifconfig eth0 0.0.0.0
+ifconfig "${INTERFACE}" 0.0.0.0