From 6f0249e39164b9d59de6550337e2901e5ed9ebf1 Mon Sep 17 00:00:00 2001
From: DmitriyEshenko <dmitriy.eshenko@vyos.io>
Date: Mon, 22 Nov 2021 20:55:06 +0000
Subject: tftp: T4012: Add TFTP VRF support

---
 src/systemd/tftpd@.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/systemd')

diff --git a/src/systemd/tftpd@.service b/src/systemd/tftpd@.service
index 266bc0962..a674bf598 100644
--- a/src/systemd/tftpd@.service
+++ b/src/systemd/tftpd@.service
@@ -7,7 +7,7 @@ RequiresMountsFor=/run
 Type=forking
 #NotifyAccess=main
 EnvironmentFile=-/etc/default/tftpd%I
-ExecStart=/usr/sbin/in.tftpd "$DAEMON_ARGS"
+ExecStart=/bin/sh -c "${VRF_ARGS} /usr/sbin/in.tftpd ${DAEMON_ARGS}"
 Restart=on-failure
 
 [Install]
-- 
cgit v1.2.3


From f2bdd26c36e7074d093e001656bc649b7c7426d3 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Wed, 1 Dec 2021 11:49:22 -0600
Subject: http-api: T3440: simplify vyos-http-api initialization

---
 src/conf_mode/http-api.py         | 2 +-
 src/systemd/vyos-http-api.service | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/systemd')

diff --git a/src/conf_mode/http-api.py b/src/conf_mode/http-api.py
index 7e4b117c8..4bfcbeb47 100755
--- a/src/conf_mode/http-api.py
+++ b/src/conf_mode/http-api.py
@@ -100,7 +100,7 @@ def apply(http_api):
         call('systemctl stop vyos-http-api.service')
 
     # Let uvicorn settle before restarting Nginx
-    time.sleep(2)
+    time.sleep(1)
 
     cmd(f'{vyos_conf_scripts_dir}/https.py', raising=ConfigError)
 
diff --git a/src/systemd/vyos-http-api.service b/src/systemd/vyos-http-api.service
index ba5df5984..55370b356 100644
--- a/src/systemd/vyos-http-api.service
+++ b/src/systemd/vyos-http-api.service
@@ -1,10 +1,9 @@
 [Unit]
 Description=VyOS HTTP API service
-After=auditd.service systemd-user-sessions.service time-sync.target vyos-router.service
+After=vyos-router.service
 Requires=vyos-router.service
 
 [Service]
-ExecStartPre=/usr/libexec/vyos/init/vyos-config
 ExecStart=/usr/libexec/vyos/services/vyos-http-api-server
 Type=idle
 
@@ -18,6 +17,5 @@ User=root
 Group=vyattacfg
 
 [Install]
-# Installing in a earlier target leaves ExecStartPre waiting
-WantedBy=getty.target
+WantedBy=vyos.target
 
-- 
cgit v1.2.3