Fix path to various non-standard directories

Fix path to non-standard directories,
- /nv to /var/local/lib/basesystem/nv
- /ramd to /var/local/lib/basesystem/ramd
- /tool_9E_SI to /etc/basesystem
- /usr/target to /etc/basesystem/target

Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>
Change-Id: I42a54624230cb0ec0271f8cdbacb0b178c9f3e8e

6 files changed, 14 insertions, 14 deletions

diff --git a/service/system/logger_service/server/Makefile b/service/system/logger_service/server/Makefile
index 5292a18..7f8f59b 100755
--- a/service/system/logger_service/server/Makefile
+++ b/service/system/logger_service/server/Makefile
@@ -23,6 +23,6 @@ all:
 install-data:install_data
 
 install_data:
-	install -d -m 755 $(DESTDIR)/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog
+	install -d -m 755 $(DESTDIR)/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog
 
 include ../../system_service.mk
diff --git a/service/system/logger_service/server/include/ss_logger_common.h b/service/system/logger_service/server/include/ss_logger_common.h
index 80a56af..758b62a 100755
--- a/service/system/logger_service/server/include/ss_logger_common.h
+++ b/service/system/logger_service/server/include/ss_logger_common.h
@@ -45,11 +45,11 @@ const CHAR PERFORMANCE_LOG_PATH_FN[] = "/tmp/frameworkunified_performance.log";
 const CHAR DRINITIAL_LOG_PATH_FN[] = "/tmp/loggerservice_drinitial.log";
 const CHAR DRLOCATION_LOG_PATH_FN[] = "/tmp/loggerservice_drlocation.log";
 const CHAR KERNEL_LOG_PATH_FN[] = "/tmp/kernel.log";
-const CHAR KERNEL_BOOT_LOG_PATH_FN[] = "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/kernelboot.log";
+const CHAR KERNEL_BOOT_LOG_PATH_FN[] = "/var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/kernelboot.log";
 
 const UI_32 PERFORMANCELOG_FILE_SZ = 256 * 1024;
 
-#define CLEAR_LOG_PATH_FN  "/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog/"
+#define CLEAR_LOG_PATH_FN  "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/frameworkunifiedlog/"
 #define NULLCHAR  '\0'
 
 #define DEBUG_USB_PATH "/mnt/sda1"
diff --git a/service/system/logger_service/server/include/ss_logger_scrshot.h b/service/system/logger_service/server/include/ss_logger_scrshot.h
index 5cc9dd9..4ac1fb6 100755
--- a/service/system/logger_service/server/include/ss_logger_scrshot.h
+++ b/service/system/logger_service/server/include/ss_logger_scrshot.h
@@ -22,9 +22,9 @@
 #ifndef LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_
 #define LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_
 
-#define JPEG_PATH_CH0     "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch0.jpeg"
-#define JPEG_PATH_CH1     "/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch1.jpeg"
+#define JPEG_PATH_CH0     "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch0.jpeg"
+#define JPEG_PATH_CH1     "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/screenShot/screen_shot_Ch1.jpeg"
 #define SCRSHOT_EXE_PATH  "/usr/agl/bin/SS_ScrShot"
-#define SCREEN_SHOT_PATH  "/nv/BS/ss/logger_service/rwdata/screenShot"
+#define SCREEN_SHOT_PATH  "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/screenShot"
 
 #endif  // LOGGER_SERVICE_SERVER_INCLUDE_SS_LOGGER_SCRSHOT_H_
diff --git a/service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp b/service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp
index fcd733e..8c1e6cb 100755
--- a/service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp
+++ b/service/system/logger_service/server/src/ss_logger_error_event_cfg.cpp
@@ -60,14 +60,14 @@ enum ARTIFACT_BIT {
 //////////////////////////////////////////////////////////////////////////////////////////
 /////  Definition for Logging Artifact Filepaths
 //////////////////////////////////////////////////////////////////////////////////////////
-const char LAF_DEBUG_FOLDER[] = "/nv/BS/ss/logger_service/rwdata";
-const char LAF_DEBUG_FOLDER2[] = "/nv/BS/ss/logger_service/rwdata/log2";
+const char LAF_DEBUG_FOLDER[] = "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata";
+const char LAF_DEBUG_FOLDER2[] = "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/log2";
 const char LAF_MONTECARLO_FN[] = "/tmp/MonteCarlo";
 const char LAF_METACORE_FN[] = "/tmp/MetaCore";
 const char LAF_CMS_FN[] = "/tmp/cms";
 const char LAF_INT_DTC_FN[] = "/tmp/dtc_error.log";
-const char LAF_LOGGERSERVICELOG_COM[] = "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/communication";
-const char LAF_KERNEL_BOOT_FN[] = "/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/kernelboot.log";
+const char LAF_LOGGERSERVICELOG_COM[] = "/var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/communication";
+const char LAF_KERNEL_BOOT_FN[] = "/var/local/lib/basesystem/ramd/BS/ss/logger_service/rwdata/frameworkunifiedlog/kernelboot.log";
 const char LAF_PSTORELOG[] = "/dev/pstore";
 
 #define ARTIFACT_BIT_ALL_OUTPUT_LOG  (ARTIFACT_BIT_LOGGERSERVICE_DEBUG_LOG |  \
diff --git a/service/system/logger_service/server/src/ss_logger_error_event_responses.cpp b/service/system/logger_service/server/src/ss_logger_error_event_responses.cpp
index dc23d8b..34f3d11 100755
--- a/service/system/logger_service/server/src/ss_logger_error_event_responses.cpp
+++ b/service/system/logger_service/server/src/ss_logger_error_event_responses.cpp
@@ -429,7 +429,7 @@ EFrameworkunifiedStatus CErrorEvent::OnClearAllLogRequest(HANDLE f_hApp) {
            clear_file_path.c_str());
   }
 
-  clear_file_path = "/nv/BS/ss/logger_service/rwdata/log2/awlog/";
+  clear_file_path = "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/log2/awlog/";
   if (CFSDirectory::RemoveSubDirectory(clear_file_path)) {
     FRAMEWORKUNIFIEDLOG(ZONE_INFO, __FUNCTION__,
            "SS_Logger Clear %s directory delete successful.",
@@ -440,7 +440,7 @@ EFrameworkunifiedStatus CErrorEvent::OnClearAllLogRequest(HANDLE f_hApp) {
            clear_file_path.c_str());
   }
 
-  clear_file_path = "/nv/BS/ss/logger_service/rwdata/log2/core/";
+  clear_file_path = "/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/log2/core/";
   if (CFSDirectory::RemoveSubDirectory(clear_file_path)) {
     FRAMEWORKUNIFIEDLOG(ZONE_INFO, __FUNCTION__,
            "SS_Logger Clear %s directory delete successful.",
diff --git a/service/system/logger_service/server/src/ss_logger_util.cpp b/service/system/logger_service/server/src/ss_logger_util.cpp
index 6ac7225..0de6022 100755
--- a/service/system/logger_service/server/src/ss_logger_util.cpp
+++ b/service/system/logger_service/server/src/ss_logger_util.cpp
@@ -1019,8 +1019,8 @@ EFrameworkunifiedStatus CLoggerUtil::CopyUntyped(std::string f_source,
   } else if (0 != S_ISDIR(l_stat.st_mode)) {
     l_eStatus = CopyDirectory(f_source, f_destination);
   } else if (0 != S_ISLNK(l_stat.st_mode)) {
-      // avoid duplicate copy for eErrorEventTypeInterfaceunifiedEmmcLogs: /nv/log/awlog -> /nv/BS/ss/logger_service/rwdata/log2/awlog
-      if (f_source.find("/nv/BS/ss/logger_service/rwdata/awlog") == std::string::npos) {
+      // avoid duplicate copy for eErrorEventTypeInterfaceunifiedEmmcLogs: /var/local/lib/basesystem/nv/log/awlog -> /nv/BS/ss/logger_service/rwdata/log2/awlog
+      if (f_source.find("/var/local/lib/basesystem/nv/BS/ss/logger_service/rwdata/awlog") == std::string::npos) {
         l_eStatus = CopyDirectory(f_source, f_destination);
       }
   } else if (0 != S_ISREG(l_stat.st_mode)) {