From 00884b249c9923a7c0d7ad46827b51e2ad39c13c Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <stumkurv@microsoft.com>
Date: Wed, 12 Feb 2020 00:09:44 +0000
Subject: [PATCH 1/2] Start RestAPI container when sonic boots

---
 files/build_templates/restapi.service.j2 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 files/build_templates/restapi.service.j2

diff --git a/files/build_templates/restapi.service.j2 b/files/build_templates/restapi.service.j2
new file mode 100644
index 00000000000..e6524addcdc
--- /dev/null
+++ b/files/build_templates/restapi.service.j2
@@ -0,0 +1,16 @@
+[Unit]
+Description=RestAPI container
+Requires=updategraph.service
+After=updategraph.service swss.service syncd.service
+Before=ntp-config.service
+
+[Service]
+User={{ sonicadmin_user }}
+ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
+ExecStart=/usr/bin/{{docker_container_name}}.sh wait
+ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+Restart=always
+RestartSec=30
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file

From 7f9934c1919b00ad230ce76ef469054619357761 Mon Sep 17 00:00:00 2001
From: Sumukha Tumkur Vani <stumkurv@microsoft.com>
Date: Wed, 12 Feb 2020 19:47:28 +0000
Subject: [PATCH 2/2] Remove unwanted dependencies

---
 files/build_templates/restapi.service.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/build_templates/restapi.service.j2 b/files/build_templates/restapi.service.j2
index e6524addcdc..df1a50eb56c 100644
--- a/files/build_templates/restapi.service.j2
+++ b/files/build_templates/restapi.service.j2
@@ -1,7 +1,7 @@
 [Unit]
 Description=RestAPI container
 Requires=updategraph.service
-After=updategraph.service swss.service syncd.service
+After=updategraph.service
 Before=ntp-config.service
 
 [Service]