适配默认配置文件，支持安装到除/usr/local以外的目录。

3 files changed, 2 insertions, 14 deletions

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
index 518c452..af173e8 100644
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@@ -4,7 +4,6 @@ configure_file(mrzcpd.pc.in mrzcpd.pc)
 configure_file(mrzcpd.sysconfig.in mrzcpd)

 

 install(FILES mrglobal.conf DESTINATION ${MR_INSTALL_SYSCONFDIR} COMPONENT Profile)

-install(FILES ${CMAKE_BINARY_DIR}/conf/mrenv.conf DESTINATION ${MR_INSTALL_SYSCONFDIR} COMPONENT Profile)

 install(FILES ${CMAKE_BINARY_DIR}/conf/mrzcpd.conf DESTINATION ${MR_INSTALL_LDCONFDIR} COMPONENT Profile)

 install(FILES ${CMAKE_BINARY_DIR}/conf/mrzcpd.pc DESTINATION ${MR_INSTALL_LIBDIR}/pkgconfig COMPONENT Profile)

 install(FILES ${CMAKE_BINARY_DIR}/conf/mrzcpd DESTINATION ${MR_INSTALL_SYSUNITCONFDIR} COMPONENT Profile)
\ No newline at end of file
diff --git a/conf/mrglobal.conf b/conf/mrglobal.conf
index ab9b8c9..849926c 100644
--- a/conf/mrglobal.conf
+++ b/conf/mrglobal.conf
@@ -34,18 +34,7 @@ sz_txvnode_buffer=128
 [burst]
 sz_rx_burst=32
 sz_tx_burst=32
-[app]
-# application symbols, use comma to split
-symbols=sapp,sapp2
-[app:sapp]
-core=5,6,7,8,9,10,11,12
-rxstream=8
-txstream=8
-[app:sapp2]
-core=13,14,15,16
-rxstream=4
-txstream=4
 [stat]
 enable=1
 [eal]
-virtaddr=0x7f40c4a00000
+virtaddr=0x7f40c4a00000
\ No newline at end of file
diff --git a/tools/systemd/mrzcpd.service.in b/tools/systemd/mrzcpd.service.in
index 50e7154..9f8365c 100644
--- a/tools/systemd/mrzcpd.service.in
+++ b/tools/systemd/mrzcpd.service.in
@@ -5,7 +5,7 @@ After=mrenv.service
 
 [Service]
 EnvironmentFile=/etc/sysconfig/mrzcpd
-ExecStart=@MR_INSTALL_BINDIR@/zcpd
+ExecStart=@MR_INSTALL_BINDIR@/zcpd -c @MR_INSTALL_SYSCONFDIR@/mrglobal.conf
 Restart=on-failure
 
 [Install]