diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-03-05 20:51:13 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-03-05 20:54:15 +0100 |
| commit | 0aa13010b1a013edc3c3a89a007108dfbb82bdad (patch) | |
| tree | 94ef398394e337dcc494404e2c92577419840368 | |
| parent | 36c46f5893fa1f4df1defcee851e44ca3ed1fd8f (diff) | |
| download | vyos-1x-0aa13010b1a013edc3c3a89a007108dfbb82bdad.tar.gz vyos-1x-0aa13010b1a013edc3c3a89a007108dfbb82bdad.zip | |
conntrackd: T4259: fix daemon configuration path
(cherry picked from commit aa8080d316dbeb4d26bf67f6d67efeda43b2bc07)
| -rw-r--r-- | debian/vyos-1x.postinst | 9 | ||||
| -rwxr-xr-x | src/helpers/vyos-vrrp-conntracksync.sh | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/debian/vyos-1x.postinst b/debian/vyos-1x.postinst index 92948de12..d54f6c5af 100644 --- a/debian/vyos-1x.postinst +++ b/debian/vyos-1x.postinst @@ -33,3 +33,12 @@ fi # ensure hte proxy user has a proper shell chsh -s /bin/sh proxy + +# Remove unwanted daemon files from /etc +# conntackd +DELETE="/etc/logrotate.d/conntrackd.distrib /etc/init.d/conntrackd /etc/default/conntrackd" +for file in $DELETE; do + if [ -f ${file} ]; then + rm -f ${file} + fi +done diff --git a/src/helpers/vyos-vrrp-conntracksync.sh b/src/helpers/vyos-vrrp-conntracksync.sh index 4501aa63e..0cc718938 100755 --- a/src/helpers/vyos-vrrp-conntracksync.sh +++ b/src/helpers/vyos-vrrp-conntracksync.sh @@ -14,12 +14,10 @@ # Modified by : Mohit Mehta <mohit@vyatta.com> # Slight modifications were made to this script for running with Vyatta # The original script came from 0.9.14 debian conntrack-tools package -# -# CONNTRACKD_BIN=/usr/sbin/conntrackd CONNTRACKD_LOCK=/var/lock/conntrack.lock -CONNTRACKD_CONFIG=/etc/conntrackd/conntrackd.conf +CONNTRACKD_CONFIG=/run/conntrackd/conntrackd.conf FACILITY=daemon LEVEL=notice TAG=conntrack-tools @@ -29,6 +27,10 @@ FAILOVER_STATE="/var/run/vyatta-conntrackd-failover-state" $LOGCMD "vyatta-vrrp-conntracksync invoked at `date`" +if ! systemctl is-active --quiet conntrackd.service; then + echo "conntrackd service not running" + exit 1 +fi if [ ! -e $FAILOVER_STATE ]; then mkdir -p /var/run |