Fix issue that not tunring on softap

- Recently hostapd path has been changed from /usr/sbin/hostapd to /usr/bin/hostapd
  So, we also change hostapd path
- Make wmeshd use /opt/usr/data/network instead of /opt/var/lib/wmesh

Change-Id: Iab7229410d7aa7cae13ce4711651f6d4ba478a67
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/packaging/wifi-mesh-manager.spec b/packaging/wifi-mesh-manager.spec
index 71201de..1eb8997 100644 (file)
--- a/packaging/wifi-mesh-manager.spec
+++ b/packaging/wifi-mesh-manager.spec
@@ -68,10 +68,6 @@ cp wmeshd.service %{buildroot}%{_unitdir}/wmeshd.service
 %post
 chmod 755 %{_sbindir}/wmesh.sh
 
-# For configuration files
-mkdir -p %TZ_SYS_VAR/lib/wmesh
-chown network_fw:network_fw %TZ_SYS_VAR/lib/wmesh
-
 %files
 %manifest wmeshd.manifest
 %license LICENSE

diff --git a/src/wmesh-softap.c b/src/wmesh-softap.c
index eb8198a..296f7ce 100644 (file)
--- a/src/wmesh-softap.c
+++ b/src/wmesh-softap.c
@@ -56,10 +56,10 @@
                                "deny_mac_file=%s\n" \
                                "ieee80211n=1\n"
 #define HOSTAPD_CONF_LEN       1024
-#define HOSTAPD_BIN            "/usr/sbin/hostapd"
-#define HOSTAPD_DEBUG_FILE     "/var/log/mesh_hostapd.log"
+#define HOSTAPD_BIN            "/usr/bin/hostapd"
+#define HOSTAPD_DEBUG_FILE     tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, "/network/mesh_hostapd.log")
 #define HOSTAPD_ENTROPY_FILE   tzplatform_mkpath(TZ_SYS_VAR, "/lib/misc/hostapd.bin")
-#define HOSTAPD_MESH_CONF_FILE tzplatform_mkpath(TZ_SYS_VAR, "/lib/wmesh/mesh_hostapd.conf")
+#define HOSTAPD_MESH_CONF_FILE tzplatform_mkpath(TZ_SYS_GLOBALUSER_DATA, "/network/mesh_hostapd.conf")
 #define HOSTAPD_CTRL_INTF_DIR  tzplatform_mkpath(TZ_SYS_RUN, "/hostapd")
 #define HOSTAPD_PID_FILE               tzplatform_mkpath(TZ_SYS_RUN, "/.mesh_hostapd.pid")
 #define HOSTAPD_ALLOWED_LIST   tzplatform_mkpath(TZ_SYS_VAR, "/lib/hostapd/hostapd.accept")