diff options
| author |   yalei wang <wylandrea@gmail.com> | 2018-09-20 02:50:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2018-09-20 02:50:40 +0000 |
| commit | 61934104c6f07757736fa6f33275f7ae0dfe9c28 (patch) | |
| tree | 65f3d78d193318267679f15520564706b0bcc3cd | |
| parent | 9f145958f0a168661b0dd4d376366d8428946ed3 (diff) | |
| parent | e0c272624602f0fa1e195e4540df2c7e081311af (diff) | |
Merge "Fix: update the path of lwip script"
| -rw-r--r-- | stacks/lwip_stack/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | stacks/lwip_stack/release/script/nstack_var.sh | 2 | ||||
| -rw-r--r-- | stacks/lwip_stack/release/start_nstack.sh | 11 | ||||
| -rw-r--r-- | stacks/lwip_stack/release/stop_nstack.sh | 6 |
4 files changed, 11 insertions, 10 deletions
diff --git a/stacks/lwip_stack/CMakeLists.txt b/stacks/lwip_stack/CMakeLists.txt index 814e5a5..297d2d9 100644 --- a/stacks/lwip_stack/CMakeLists.txt +++ b/stacks/lwip_stack/CMakeLists.txt @@ -61,8 +61,6 @@ execute_process( COMMAND cp -rf ${CMAKE_CURRENT_LIST_DIR}/../../release/include ${CMAKE_CURRENT_LIST_DIR}/src/ COMMAND cp ${CMAKE_CURRENT_LIST_DIR}/../../release/lib64/libnStackAPI.so ${CMAKE_CURRENT_LIST_DIR}/release/lib64/ COMMAND cp ${CMAKE_CURRENT_LIST_DIR}/../../release/lib64/libdmm_api.so ${CMAKE_CURRENT_LIST_DIR}/release/lib64/ - COMMAND cp ${CMAKE_CURRENT_LIST_DIR}/../../build/libnStackMaintain.a ${CMAKE_CURRENT_LIST_DIR}/release/lib64/ - COMMAND cp ${CMAKE_CURRENT_LIST_DIR}/../../build/libsocket.a ${CMAKE_CURRENT_LIST_DIR}/build/ COMMAND echo "stacklwip prepare ok" ) execute_process( diff --git a/stacks/lwip_stack/release/script/nstack_var.sh b/stacks/lwip_stack/release/script/nstack_var.sh index 15ef2f0..4c5c6f6 100644 --- a/stacks/lwip_stack/release/script/nstack_var.sh +++ b/stacks/lwip_stack/release/script/nstack_var.sh @@ -26,7 +26,7 @@ DPDK_FILE_NAME=nstack_dpdk.log export VM_ID=agent-node-x -export DPDK_INSTALL_PATH="/root/dpdk/dpdk-18.02" +export DPDK_INSTALL_PATH="/tmp/dpdk/dpdk-18.02/" export DPDK_LIB_PATH=${DPDK_INSTALL_PATH}/x86_64-native-linuxapp-gcc/lib export DPDK_TOOL_DIR=${DPDK_INSTALL_PATH}/usertools export DPDK_MOD_PATH=${DPDK_INSTALL_PATH}/x86_64-native-linuxapp-gcc/kmod diff --git a/stacks/lwip_stack/release/start_nstack.sh b/stacks/lwip_stack/release/start_nstack.sh index c005f25..db0c084 100644 --- a/stacks/lwip_stack/release/start_nstack.sh +++ b/stacks/lwip_stack/release/start_nstack.sh @@ -1,9 +1,11 @@ #!/bin/bash -. ./script/nstack_var.sh -. ./script/nstack_fun.sh script_path=$(cd "$(dirname "$0")"; pwd) + +. ${script_path}/script/nstack_var.sh +. ${script_path}/script/nstack_fun.sh + config_name=${script_path}/script/nstack_var.sh if [ ! -e $config_name ]; then log $LINENO "nstack_var.sh not exit, plz check!" @@ -59,7 +61,7 @@ if [ -f "lockfile" ]; then rm lockfile fi -. ./script/nstack_var.sh +. ${script_path}/script/nstack_var.sh ######################################################## @@ -115,8 +117,7 @@ install_config core_mask=1 START_TYPE="primary" log $LINENO "./script/run_nstack_main.sh ${core_mask} $HUGE_DIR $MEM_SIZE $START_TYPE" -cd script -./run_nstack_main.sh $HUGE_DIR $MEM_SIZE +${script_path}/script/run_nstack_main.sh $HUGE_DIR $MEM_SIZE print_pid=$(ps -ux | grep nStackMain | awk '{print $2}' | awk 'NR == 2') echo "nStackMain PID:$print_pid" diff --git a/stacks/lwip_stack/release/stop_nstack.sh b/stacks/lwip_stack/release/stop_nstack.sh index 9b9fe94..48d1af7 100644 --- a/stacks/lwip_stack/release/stop_nstack.sh +++ b/stacks/lwip_stack/release/stop_nstack.sh @@ -1,9 +1,11 @@ #!/bin/bash -. ./script/nstack_var.sh -. ./script/nstack_fun.sh script_path=$(cd "$(dirname "$0")"; pwd) + +. ${script_path}/script/nstack_var.sh +. ${script_path}/script/nstack_fun.sh + config_name=${script_path}/script/nstack_var.sh if [ ! -e $config_name ]; then log $LINENO "$config_name not exit, plz pay attention and add back!,or it has resourcce leak." |