From f8f9c06c01485be54b0411e55ae866fff1a795e3 Mon Sep 17 00:00:00 2001
From: Alex <60006044+BuonHobo@users.noreply.github.com>
Date: Wed, 25 Oct 2023 18:58:19 +0200
Subject: [PATCH 1/3] Added workaround.conf file to fix the frr image

This file overrides the default systemd unit for the frr service and wraps the commands with su. This allows the image to work on arch linux and red hat based distros
---
 frr/workaround.conf | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 frr/workaround.conf

diff --git a/frr/workaround.conf b/frr/workaround.conf
new file mode 100644
index 0000000..91fb7c3
--- /dev/null
+++ b/frr/workaround.conf
@@ -0,0 +1,7 @@
+[Service]
+ExecStart=
+ExecStop=
+ExecReload=
+ExecStart=/usr/bin/su -c "/usr/lib/frr/frrinit.sh start"
+ExecStop=/usr/bin/su -c "/usr/lib/frr/frrinit.sh stop"
+ExecReload=/usr/bin/su -c "/usr/lib/frr/frrinit.sh reload"

From 217fb8a93f129062775b8eedea51a45295509c19 Mon Sep 17 00:00:00 2001
From: Alex <60006044+BuonHobo@users.noreply.github.com>
Date: Wed, 25 Oct 2023 19:02:20 +0200
Subject: [PATCH 2/3] Included workaround for frr on arch and redhat

---
 frr/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frr/Dockerfile b/frr/Dockerfile
index 9a61119..f452f6b 100644
--- a/frr/Dockerfile
+++ b/frr/Dockerfile
@@ -13,3 +13,5 @@ RUN sed -i -e 's/service/no service/' /etc/frr/vtysh.conf \
 
 RUN apt clean && \
     rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/*
+
+COPY workaround.conf /etc/systemd/system/frr.service.d/workaround.conf

From da888d492211c59513922cb1a6ce1365431a4975 Mon Sep 17 00:00:00 2001
From: Alex <60006044+BuonHobo@users.noreply.github.com>
Date: Thu, 16 Nov 2023 22:16:22 +0100
Subject: [PATCH 3/3] renamed workaround.conf to su_frr.conf

---
 frr/Dockerfile                       | 2 +-
 frr/{workaround.conf => su_frr.conf} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename frr/{workaround.conf => su_frr.conf} (100%)

diff --git a/frr/Dockerfile b/frr/Dockerfile
index f452f6b..8305424 100644
--- a/frr/Dockerfile
+++ b/frr/Dockerfile
@@ -14,4 +14,4 @@ RUN sed -i -e 's/service/no service/' /etc/frr/vtysh.conf \
 RUN apt clean && \
     rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/*
 
-COPY workaround.conf /etc/systemd/system/frr.service.d/workaround.conf
+COPY su_frr.conf /etc/systemd/system/frr.service.d/su_frr.conf
diff --git a/frr/workaround.conf b/frr/su_frr.conf
similarity index 100%
rename from frr/workaround.conf
rename to frr/su_frr.conf