From fb22ab1cb6bbd45dc7b9a7383c7d37db5cf85373 Mon Sep 17 00:00:00 2001
From: luqiuwen <luqiuwen@iie.ac.cn>
Date: Tue, 17 Sep 2019 10:51:31 +0800
Subject: [PATCH] =?UTF-8?q?#165=20=E5=A2=9E=E5=8A=A0PostInstall=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=88=9B=E5=BB=BA=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E6=96=87=E4=BB=B6=E5=AD=98=E5=82=A8=E7=9A=84=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmake/Package.cmake           | 6 +++---
 cmake/PostInstall.in          | 6 ++++--
 cmake/PostUninstall.in        | 6 ++++--
 cmake/PreUninstall.in         | 4 +++-
 script/service/tfe-env-config | 2 --
 script/service/tfe.service    | 1 +
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 540be52..d36b3e7 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -19,9 +19,9 @@ set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
 set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
 set(CPACK_RPM_DEBUGINFO_PACKAGE on)
-#set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
-#set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
-#set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
+set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
+set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
+set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
 
 # Must uninstall the debug package before install release package
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in
index d52334e..3924da1 100644
--- a/cmake/PostInstall.in
+++ b/cmake/PostInstall.in
@@ -1,2 +1,4 @@
-%systemd_post mrenv.service mrzcpd.service mrtunnat.service
-/sbin/ldconfig
\ No newline at end of file
+%systemd_post tfe-env.service tfe-env-tun-mode.service tfe.service
+%sysctl_apply
+%tmpfiles_create
+/sbin/ldconfig
diff --git a/cmake/PostUninstall.in b/cmake/PostUninstall.in
index d24e6f5..86b5159 100644
--- a/cmake/PostUninstall.in
+++ b/cmake/PostUninstall.in
@@ -1,2 +1,4 @@
-%systemd_postun_with_restart mrenv.service mrzcpd.service mrtunnat.service
-/sbin/ldconfig
\ No newline at end of file
+%systemd_postun_with_restart tfe-env.service tfe-env-tun-mode.service tfe.service
+%sysctl_apply
+%tmpfiles_create
+/sbin/ldconfig
diff --git a/cmake/PreUninstall.in b/cmake/PreUninstall.in
index 4dbf922..0e04afa 100644
--- a/cmake/PreUninstall.in
+++ b/cmake/PreUninstall.in
@@ -1 +1,3 @@
-%systemd_preun mrenv.service mrzcpd.service mrtunnat.service
\ No newline at end of file
+%systemd_preun tfe-env.service tfe-env-tun-mode.service tfe.service
+%sysctl_apply
+%tmpfiles_create
diff --git a/script/service/tfe-env-config b/script/service/tfe-env-config
index 69936e0..310b95c 100644
--- a/script/service/tfe-env-config
+++ b/script/service/tfe-env-config
@@ -1,4 +1,3 @@
-
 TFE_DEVICE_DATA_INCOMING=tun_kni
 TFE_LOCAL_MAC_DATA_INCOMING=fe:65:b7:00:00:01
 TFE_PEER_MAC_DATA_INCOMING=aa:bb:cc:dd:ee:ff
@@ -6,4 +5,3 @@ TFE_LOCAL_IP_DATA_INCOMING=172.16.241.2
 TFE_PEER_IP_DATA_INCOMING=172.16.241.1
 TFE_WATCHDOG_DEVICE=enp2s0
 TFE_WATCHDOG_IP=192.168.100.1
-
diff --git a/script/service/tfe.service b/script/service/tfe.service
index b5b39a0..1dc8519 100644
--- a/script/service/tfe.service
+++ b/script/service/tfe.service
@@ -6,6 +6,7 @@ After=tfe-env.service
 [Service]
 Type=simple
 ExecStart=/opt/tsg/tfe/bin/tfe
+WorkingDirectory=/opt/tsg/tfe/
 TimeoutSec=180s
 RestartSec=10s
 Restart=always