From d5a8b1132eab532a112d92dcc916aabca03a6b55 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Sun, 8 Dec 2024 14:54:04 -0700
Subject: [PATCH] Explicitly install systemd on ubuntu

---
 custom/testing/golden-state-tree/os/ubuntu/pkgs/init.sls | 1 +
 custom/testing/golden-state-tree/pkgs/systemd.sls        | 4 ++++
 custom/testing/ubuntu-20.04.Dockerfile                   | 1 -
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 custom/testing/golden-state-tree/pkgs/systemd.sls

diff --git a/custom/testing/golden-state-tree/os/ubuntu/pkgs/init.sls b/custom/testing/golden-state-tree/os/ubuntu/pkgs/init.sls
index 4e3e0c4..0af9cea 100644
--- a/custom/testing/golden-state-tree/os/ubuntu/pkgs/init.sls
+++ b/custom/testing/golden-state-tree/os/ubuntu/pkgs/init.sls
@@ -33,6 +33,7 @@ include:
   - pkgs.rng-tools
   - pkgs.rsync
   - pkgs.sed
+  - pkgs.systemd
   - pkgs.swig
   - pkgs.tar
   - pkgs.zlib
diff --git a/custom/testing/golden-state-tree/pkgs/systemd.sls b/custom/testing/golden-state-tree/pkgs/systemd.sls
new file mode 100644
index 0000000..94843dd
--- /dev/null
+++ b/custom/testing/golden-state-tree/pkgs/systemd.sls
@@ -0,0 +1,4 @@
+{%- set pkg_name = "systemd" -%}
+systemd:
+  pkg.installed:
+    - name: {{ pkg_name }}
diff --git a/custom/testing/ubuntu-20.04.Dockerfile b/custom/testing/ubuntu-20.04.Dockerfile
index 07c1d17..0a072be 100644
--- a/custom/testing/ubuntu-20.04.Dockerfile
+++ b/custom/testing/ubuntu-20.04.Dockerfile
@@ -37,7 +37,6 @@ RUN <<EOF
   rm -rf /var/cache/salt
   rm -rf /etc/salt
   rm -rf /tmp/*
-  ln -s /bin/systemd /usr/lib/systemd/systemd
   apt-get clean
   rm -rf /var/cache/apt/archives/*
 EOF