aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryalei wang <wylandrea@gmail.com>2018-10-22 07:54:45 +0000
committerGerrit Code Review <gerrit@fd.io>2018-10-22 07:54:45 +0000
commit6f487b9221e5a0a5dd95d150509684570473ae1d (patch)
tree2e441a77e9351ec217f0068ec3b4cb8c32c45a6e
parente29af930882238ad7837b2ab48c0be3103e4c575 (diff)
parentf1f182f8942cbc738782386b00d162034ae9e199 (diff)
Merge "Fix: update the file attr"
-rw-r--r--src/framework/common/base/liblinuxapi/nsfw_lock_file.c2
-rw-r--r--src/framework/include/nsfw_mgr_com_api.h1
-rw-r--r--src/framework/ipc/mgr_com/mgr_com.c1
-rw-r--r--stacks/lwip_stack/CMakeLists.txt2
-rwxr-xr-x[-rw-r--r--]stacks/lwip_stack/release/script/nstack_var.sh0
-rwxr-xr-x[-rw-r--r--]stacks/lwip_stack/release/script/run_nstack_main.sh0
-rwxr-xr-x[-rw-r--r--]stacks/lwip_stack/release/script/run_nstack_master.sh0
-rwxr-xr-x[-rw-r--r--]stacks/lwip_stack/release/send_alarm.sh0
-rwxr-xr-x[-rw-r--r--]stacks/lwip_stack/release/start_nstack.sh0
-rwxr-xr-x[-rw-r--r--]stacks/lwip_stack/release/stop_nstack.sh0
-rwxr-xr-x[-rw-r--r--]stacks/lwip_stack/release/uninstall.sh0
11 files changed, 3 insertions, 3 deletions
diff --git a/src/framework/common/base/liblinuxapi/nsfw_lock_file.c b/src/framework/common/base/liblinuxapi/nsfw_lock_file.c
index abfbfd1..cef8d95 100644
--- a/src/framework/common/base/liblinuxapi/nsfw_lock_file.c
+++ b/src/framework/common/base/liblinuxapi/nsfw_lock_file.c
@@ -94,6 +94,8 @@ nsfw_proc_start_with_lock (u8 proc_type)
return -1;
}
+ nsfw_mgr_com_mkdir_domainpath (lock_fpath);
+
ret = STRCAT_S (lock_fpath, NSFW_FILE_PATH_LEN, module_name);
if (EOK != ret)
{
diff --git a/src/framework/include/nsfw_mgr_com_api.h b/src/framework/include/nsfw_mgr_com_api.h
index 56ec08f..9bbcaca 100644
--- a/src/framework/include/nsfw_mgr_com_api.h
+++ b/src/framework/include/nsfw_mgr_com_api.h
@@ -186,6 +186,7 @@ extern int nsfw_mgr_run_script (const char *cmd, char *result,
extern int nsfw_mgr_com_chk_hbt (int v_add);
extern i32 nsfw_set_close_on_exec (i32 sock);
extern int nsfw_mgr_comm_fd_init (u32 proc_type);
+extern void nsfw_mgr_com_mkdir_domainpath (char *pathname);
#ifdef __cplusplus
/* *INDENT-OFF* */
diff --git a/src/framework/ipc/mgr_com/mgr_com.c b/src/framework/ipc/mgr_com/mgr_com.c
index 2fb9789..a2998fa 100644
--- a/src/framework/ipc/mgr_com/mgr_com.c
+++ b/src/framework/ipc/mgr_com/mgr_com.c
@@ -1828,7 +1828,6 @@ nsfw_mgr_comm_fd_init (u32 proc_type)
* Calls :
* Called By :
*****************************************************************************/
-void nsfw_mgr_com_mkdir_domainpath (char *pathname);
void
nsfw_mgr_com_mkdir_domainpath (char *pathname)
{
diff --git a/stacks/lwip_stack/CMakeLists.txt b/stacks/lwip_stack/CMakeLists.txt
index 297d2d9..3992f20 100644
--- a/stacks/lwip_stack/CMakeLists.txt
+++ b/stacks/lwip_stack/CMakeLists.txt
@@ -48,8 +48,6 @@ FILE(WRITE ${post_compile} "#!/bin/bash\n")
FILE(APPEND ${post_compile}
"
-find ${CMAKE_CURRENT_LIST_DIR}/release/ -name \"*.sh\" -exec chmod +x {} \\;
-find ${CMAKE_CURRENT_LIST_DIR}/release/ -name \"*.py\" -exec chmod +x {} \\;
ln -sfn ./run_nstack_main.sh ${CMAKE_CURRENT_LIST_DIR}/release/script/run_nstack.sh
echo post compile process success.
"
diff --git a/stacks/lwip_stack/release/script/nstack_var.sh b/stacks/lwip_stack/release/script/nstack_var.sh
index 9a1c612..9a1c612 100644..100755
--- a/stacks/lwip_stack/release/script/nstack_var.sh
+++ b/stacks/lwip_stack/release/script/nstack_var.sh
diff --git a/stacks/lwip_stack/release/script/run_nstack_main.sh b/stacks/lwip_stack/release/script/run_nstack_main.sh
index 2bd9e0d..2bd9e0d 100644..100755
--- a/stacks/lwip_stack/release/script/run_nstack_main.sh
+++ b/stacks/lwip_stack/release/script/run_nstack_main.sh
diff --git a/stacks/lwip_stack/release/script/run_nstack_master.sh b/stacks/lwip_stack/release/script/run_nstack_master.sh
index 8da0d49..8da0d49 100644..100755
--- a/stacks/lwip_stack/release/script/run_nstack_master.sh
+++ b/stacks/lwip_stack/release/script/run_nstack_master.sh
diff --git a/stacks/lwip_stack/release/send_alarm.sh b/stacks/lwip_stack/release/send_alarm.sh
index 46ea413..46ea413 100644..100755
--- a/stacks/lwip_stack/release/send_alarm.sh
+++ b/stacks/lwip_stack/release/send_alarm.sh
diff --git a/stacks/lwip_stack/release/start_nstack.sh b/stacks/lwip_stack/release/start_nstack.sh
index db0c084..db0c084 100644..100755
--- a/stacks/lwip_stack/release/start_nstack.sh
+++ b/stacks/lwip_stack/release/start_nstack.sh
diff --git a/stacks/lwip_stack/release/stop_nstack.sh b/stacks/lwip_stack/release/stop_nstack.sh
index 48d1af7..48d1af7 100644..100755
--- a/stacks/lwip_stack/release/stop_nstack.sh
+++ b/stacks/lwip_stack/release/stop_nstack.sh
diff --git a/stacks/lwip_stack/release/uninstall.sh b/stacks/lwip_stack/release/uninstall.sh
index 92ae5fe..92ae5fe 100644..100755
--- a/stacks/lwip_stack/release/uninstall.sh
+++ b/stacks/lwip_stack/release/uninstall.sh