Modified directory path by tizen platform config

Change-Id: Ibbb12a15d0ac3daa61b8b7b8d581d0566b66a9e4
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 9a72aa5..75f9c41 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,6 +1,6 @@
 Name:          net-config
 Summary:       TIZEN Network Configuration service
-Version:       1.1.56
+Version:       1.1.57
 Release:       2
 Group:         System/Network
 License:       Apache-2.0
@@ -20,6 +20,7 @@ BuildRequires:        pkgconfig(capi-appfw-application)
 BuildRequires: pkgconfig(capi-network-wifi-direct)
 BuildRequires: cmake
 BuildRequires: pkgconfig(sqlite3)
+BuildRequires: pkgconfig(libtzplatform-config)
 Requires:              vconf
 Requires:              connman
 Requires:              systemd
@@ -94,19 +95,19 @@ cp resources/etc/resolv.conf %{buildroot}%{_sysconfdir}/resolv.conf
 mkdir -p %{buildroot}%{_sbindir}/
 cp resources/usr/sbin/net-config.service %{buildroot}%{_sbindir}/net-config.service
 
-mkdir -p %{buildroot}/usr/dbspace
-sqlite3 %{buildroot}/usr/dbspace/.wifi_offload.db < resources/usr/share/wifi_offloading.sql
+mkdir -p %{buildroot}%{TZ_SYS_DB}
+sqlite3 %{buildroot}%{TZ_SYS_DB}/.wifi_offload.db < resources/usr/share/wifi_offloading.sql
 
 #DBus DAC (net-config.manifest enables DBus SMACK)
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 cp resources/etc/dbus-1/system.d/net-config.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/net-config.conf
 
 #log dump
-mkdir -p %{buildroot}/opt/etc/dump.d/module.d/
-cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}/opt/etc/dump.d/module.d/network_log_dump.sh
-mkdir -p %{buildroot}/opt/var/lib/net-config/
-cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}/opt/var/lib/net-config/network_log_dump.sh
-cp resources/opt/etc/dump.d/module.d/network_dump.sh %{buildroot}/opt/var/lib/net-config/network_dump.sh
+mkdir -p %{buildroot}%{TZ_SYS_ETC}/dump.d/module.d/
+cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}%{TZ_SYS_ETC}/dump.d/module.d/network_log_dump.sh
+mkdir -p %{buildroot}%{TZ_SYS_VAR}/lib/net-config/
+cp resources/opt/etc/dump.d/module.d/network_log_dump.sh %{buildroot}%{TZ_SYS_VAR}/lib/net-config/network_log_dump.sh
+cp resources/opt/etc/dump.d/module.d/network_dump.sh %{buildroot}%{TZ_SYS_VAR}/lib/net-config/network_dump.sh
 
 %if 0%{?model_build_feature_wlan_wearable} == 1
 #softreset scripts
@@ -121,9 +122,9 @@ cp LICENSE %{buildroot}%{_datadir}/license/net-config
 %post
 
 #Network logs
-mkdir -p /opt/usr/data/network
-chmod 755 /opt/usr/data/network
-chsmack -a net-config::logging /opt/usr/data/network
+mkdir -p %{TZ_USER_DATA}/network
+chmod 755 %{TZ_USER_DATA}/network
+chsmack -a net-config::logging %{TZ_USER_DATA}/network
 
 #Add net-config.service to systemd extra default dependency ignore list
 mkdir -p %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
@@ -156,11 +157,11 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen
 %attr(644,root,root) %{_unitdir}/multi-user.target.wants/net-config.service
 %endif
 %{_datadir}/license/net-config
-%attr(660,root,root) /usr/dbspace/.wifi_offload.db
-%attr(664,root,root) /usr/dbspace/.wifi_offload.db-journal
-%attr(500,root,root) /opt/etc/dump.d/module.d/network_log_dump.sh
-%attr(500,root,root) /opt/var/lib/net-config/network_log_dump.sh
-%attr(500,root,root) /opt/var/lib/net-config/network_dump.sh
+%attr(660,root,root) %{TZ_SYS_DB}/.wifi_offload.db
+%attr(664,root,root) %{TZ_SYS_DB}/.wifi_offload.db-journal
+%attr(500,root,root) %{TZ_SYS_ETC}/dump.d/module.d/network_log_dump.sh
+%attr(500,root,root) %{TZ_SYS_VAR}/lib/net-config/network_log_dump.sh
+%attr(500,root,root) %{TZ_SYS_VAR}/lib/net-config/network_dump.sh
 %if "%{profile}" == "tv"
 %attr(644,root,root) %{_libdir}/udev/rules.d/99-wifiusb-dev.rules
 %endif

diff --git a/resources/opt/etc/dump.d/module.d/network_dump.sh b/resources/opt/etc/dump.d/module.d/network_dump.sh
index add7e58..12fe37b 100755 (executable)
--- a/resources/opt/etc/dump.d/module.d/network_dump.sh
+++ b/resources/opt/etc/dump.d/module.d/network_dump.sh
@@ -3,7 +3,7 @@
 # $1 is passed by dump_service
 
 export DISPLAY=:0.0
-NETWORK_ORG=/opt/usr/data/network
+NETWORK_ORG=${TZ_USER_DATA}/network
 NETWORK_DEBUG=$1/network
 
 /bin/mkdir -p ${NETWORK_DEBUG}

diff --git a/resources/opt/etc/dump.d/module.d/network_log_dump.sh b/resources/opt/etc/dump.d/module.d/network_log_dump.sh
index 72399c2..482047a 100755 (executable)
--- a/resources/opt/etc/dump.d/module.d/network_log_dump.sh
+++ b/resources/opt/etc/dump.d/module.d/network_log_dump.sh
@@ -11,7 +11,7 @@ then
 fi
 
 export DISPLAY=:0.0
-NETWORK_ORG=/opt/usr/data/network
+NETWORK_ORG=${TZ_USER_DATA}/network
 NETWORK_DEBUG=$1/network
 
 /bin/mkdir -p ${NETWORK_DEBUG}

diff --git a/resources/usr/sbin/net-config.service b/resources/usr/sbin/net-config.service
index e429b94..f779306 100755 (executable)
--- a/resources/usr/sbin/net-config.service
+++ b/resources/usr/sbin/net-config.service
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-if [ -f /opt/etc/.mac.info ]; then
+if [ -f ${TZ_SYS_SHARE}/.mac.info ]; then
        bssid="$(/usr/bin/vconftool get -t string db/wifi/bssid_address | /bin/sed -n "/\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]/p")"
-       fbssid="$(/bin/cat /opt/etc/.mac.info | /bin/sed -n "/\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]/p")"
+       fbssid="$(/bin/cat ${TZ_SYS_SHARE}/.mac.info | /bin/sed -n "/\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]/p")"
 
        if [ "$bssid" != "$fbssid" ]; then
-               /bin/cat /opt/etc/.mac.info | /bin/sed -n "/^\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]$/p" | /usr/bin/xargs /usr/bin/vconftool set -t string db/wifi/bssid_address -f
+               /bin/cat ${TZ_SYS_SHARE}/.mac.info | /bin/sed -n "/^\([0-9A-F][0-9A-F]:\)\{5\}[0-9A-F][0-9A-F]$/p" | /usr/bin/xargs /usr/bin/vconftool set -t string db/wifi/bssid_address -f
        fi
 fi
 

diff --git a/src/utils/log.c b/src/utils/log.c
index 7a358f6..2472082 100755 (executable)
--- a/src/utils/log.c
+++ b/src/utils/log.c
@@ -23,10 +23,11 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <tzplatform_config.h>
 
 #include "log.h"
 
-#define LOG_FILE_PATH  "/opt/usr/data/network/netconfig.log"
+#define LOG_FILE_PATH  tzplatform_mkpath(TZ_USER_DATA, "/network/netconfig.log")
 #define MAX_LOG_SIZE   1 * 1024 * 1024
 #define MAX_LOG_COUNT  1
 

diff --git a/src/utils/util.c b/src/utils/util.c
index df755ca..07875df 100755 (executable)
--- a/src/utils/util.c
+++ b/src/utils/util.c
@@ -38,6 +38,7 @@
 #include <bundle.h>
 #include <bundle_internal.h>
 #include <eventsystem.h>
+#include <tzplatform_config.h>
 
 #include "log.h"
 #include "util.h"
@@ -45,7 +46,7 @@
 #include "wifi-state.h"
 
 #define WC_POPUP_EXTRA_DATA_KEY        "http://tizen.org/appcontrol/data/connection_type"
-#define MAC_INFO_FILEPATH              "/opt/etc/.mac.info"
+#define MAC_INFO_FILEPATH              tzplatform_mkpath(TZ_SYS_SHARE, "/.mac.info")
 #define MAC_ADDRESS_MAX_LEN            18
 
 static gboolean netconfig_device_picker_test = FALSE;

diff --git a/src/wifi-dump.c b/src/wifi-dump.c
index b98581e..1878581 100755 (executable)
--- a/src/wifi-dump.c
+++ b/src/wifi-dump.c
@@ -18,6 +18,7 @@
  */
 
 #include <glib.h>
+#include <tzplatform_config.h>
 
 #include "log.h"
 
@@ -25,13 +26,13 @@
 #include "netdbus.h"
 #include "wifi-dump.h"
 
-#define NETWORK_DUMP_SCRIPT             "/opt/var/lib/net-config/network_dump.sh"
+#define NETWORK_DUMP_SCRIPT            tzplatform_mkpath(TZ_SYS_VAR, "/lib/net-config/network_dump.sh")
 
 static int _start_dump(gchar *dump_path)
 {
        int rv = 0;
        gchar *path = NETWORK_DUMP_SCRIPT;
-       char *const args[] = { "/opt/var/lib/net-config/network_dump.sh", dump_path, NULL };
+       char *const args[] = { path, dump_path, NULL };
        char *const envs[] = { NULL };
 
        rv = netconfig_execute_file(path, args, envs);

diff --git a/src/wifi-power.c b/src/wifi-power.c
index 100abb0..fa33939 100755 (executable)
--- a/src/wifi-power.c
+++ b/src/wifi-power.c
@@ -23,6 +23,7 @@
 #include <ITapiSim.h>
 #include <TapiUtility.h>
 #include <stdio.h>
+#include <tzplatform_config.h>
 
 #if defined TIZEN_P2P_ENABLE && !defined WLAN_CONCURRENT_MODE
 #include <wifi-direct.h>
@@ -60,7 +61,7 @@ static weconn_h weconn_handle = NULL;
 #define VCONFKEY_SETAPPL_NETWORK_PERMIT_WITH_LCD_OFF_LIMIT     "db/setting/network_with_lcd_off_limit"
 #endif
 
-#define WLAN_MAC_INFO              "/opt/etc/.mac.info"
+#define WLAN_MAC_INFO              tzplatform_mkpath(TZ_SYS_SHARE, "/.mac.info")
 #define WLAN_MAC_ADDR_MAX          20
 #define VCONF_WIFI_BSSID_ADDRESS       "db/wifi/bssid_address"