summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluqiuwen <[email protected]>2019-09-26 14:27:20 +0800
committerluqiuwen <[email protected]>2019-09-26 14:27:20 +0800
commit7bffff1444648f65e7a85707c5f3fa8ec22deee2 (patch)
treeed22b60e14a7c5ca702e41765eddd1e5b51659ed
parent6a970cb29f50d90ca6094a274943bc20d87a2680 (diff)
修正TUN模式下的TFE-ENV文件,增加network-online的启动依赖项。
-rw-r--r--script/service/tfe-env-tun-mode.service4
-rw-r--r--script/service/tfe-env.service1
-rw-r--r--script/service/tfe.service1
3 files changed, 5 insertions, 1 deletions
diff --git a/script/service/tfe-env-tun-mode.service b/script/service/tfe-env-tun-mode.service
index bb2e4b9..1fbfe48 100644
--- a/script/service/tfe-env-tun-mode.service
+++ b/script/service/tfe-env-tun-mode.service
@@ -2,6 +2,8 @@
Description=Tango Frontend Engine - Running Environment Setup
Requires=tfe-env.service
Before=tfe-env.service
+After=network-online.target
+Wants=network-online.target
[Service]
EnvironmentFile=/etc/sysconfig/tfe-env-config
@@ -14,7 +16,7 @@ ExecStop=/bin/true
# start
ExecStartPost=/usr/sbin/ifconfig ${TFE_WATCHDOG_DEVICE} ${TFE_WATCHDOG_IP}
-ExecStartPost=/usr/sbin/ip tuntap add dev ${TFE_DEVICE_DATA_INCOMING} mode tap
+ExecStartPost=/usr/sbin/ip tuntap add dev ${TFE_DEVICE_DATA_INCOMING} mode tap
ExecStartPost=/usr/sbin/ifconfig ${TFE_DEVICE_DATA_INCOMING} up
# stop
diff --git a/script/service/tfe-env.service b/script/service/tfe-env.service
index 22b5c1d..3ae24b8 100644
--- a/script/service/tfe-env.service
+++ b/script/service/tfe-env.service
@@ -2,6 +2,7 @@
Description=Tango Frontend Engine - Running Environment Setup
Before=tsgkni.service
Wants=network-online.target
+After=network-online.target
[Service]
EnvironmentFile=/etc/sysconfig/tfe-env-config
diff --git a/script/service/tfe.service b/script/service/tfe.service
index ace347a..ec19e52 100644
--- a/script/service/tfe.service
+++ b/script/service/tfe.service
@@ -3,6 +3,7 @@ Description=Tango Frontend Engine
Requires=tfe-env.service
After=tfe-env.service
+
[Service]
Type=notify
ExecStart=/opt/tsg/tfe/bin/tfe