Removed TZ_USER_DATA and some patch

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

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index 75f9c41..cb3bdb9 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.57
+Version:       1.1.58
 Release:       2
 Group:         System/Network
 License:       Apache-2.0
@@ -122,9 +122,9 @@ cp LICENSE %{buildroot}%{_datadir}/license/net-config
 %post
 
 #Network logs
-mkdir -p %{TZ_USER_DATA}/network
-chmod 755 %{TZ_USER_DATA}/network
-chsmack -a net-config::logging %{TZ_USER_DATA}/network
+mkdir -p /opt/usr/data/network
+chmod 755 /opt/usr/data/network
+chsmack -a net-config::logging /opt/usr/data/network
 
 #Add net-config.service to systemd extra default dependency ignore list
 mkdir -p %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/

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 12fe37b..add7e58 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=${TZ_USER_DATA}/network
+NETWORK_ORG=/opt/usr/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 482047a..72399c2 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=${TZ_USER_DATA}/network
+NETWORK_ORG=/opt/usr/data/network
 NETWORK_DEBUG=$1/network
 
 /bin/mkdir -p ${NETWORK_DEBUG}

diff --git a/src/utils/log.c b/src/utils/log.c
index 2472082..0564afb 100755 (executable)
--- a/src/utils/log.c
+++ b/src/utils/log.c
@@ -27,7 +27,7 @@
 
 #include "log.h"
 
-#define LOG_FILE_PATH  tzplatform_mkpath(TZ_USER_DATA, "/network/netconfig.log")
+#define LOG_FILE_PATH  "/opt/usr/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 07875df..1e3e9a2 100755 (executable)
--- a/src/utils/util.c
+++ b/src/utils/util.c
@@ -46,7 +46,7 @@
 #include "wifi-state.h"
 
 #define WC_POPUP_EXTRA_DATA_KEY        "http://tizen.org/appcontrol/data/connection_type"
-#define MAC_INFO_FILEPATH              tzplatform_mkpath(TZ_SYS_SHARE, "/.mac.info")
+#define MAC_INFO_FILEPATH              tzplatform_mkpath(TZ_SYS_ETC, "/.mac.info")
 #define MAC_ADDRESS_MAX_LEN            18
 
 static gboolean netconfig_device_picker_test = FALSE;

diff --git a/src/wifi-power.c b/src/wifi-power.c
index fa33939..9f4f09a 100755 (executable)
--- a/src/wifi-power.c
+++ b/src/wifi-power.c
@@ -61,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              tzplatform_mkpath(TZ_SYS_SHARE, "/.mac.info")
+#define WLAN_MAC_INFO              tzplatform_mkpath(TZ_SYS_ETC, "/.mac.info")
 #define WLAN_MAC_ADDR_MAX          20
 #define VCONF_WIFI_BSSID_ADDRESS       "db/wifi/bssid_address"