From 76d367b6d083e51967359ad08dd4b4c6e2656c31 Mon Sep 17 00:00:00 2001
From: Brianna Bennett <brbennett@mnx.io>
Date: Sun, 12 Jan 2025 19:47:37 -0800
Subject: [PATCH 1/4] Restore systemd to ubuntu

---
 .github/workflows/build.yaml | 1 +
 ubuntu/Dockerfile            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 53bc22c..565d47c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,6 +7,7 @@ on:
             - '**.md'
         branches:
             - master
+            - 202501
 jobs:
     prepare:
         name: Create Release
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index d6f45d6..dc2cef7 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -2,4 +2,5 @@ ARG UBUNTU_RELEASE
 FROM ubuntu:${UBUNTU_RELEASE}
 COPY helpers /helpers
 ARG UBUNTU_RELEASE=${UBUNTU_RELEASE}
+RUN apt-get update && apt-get install -y systemd
 RUN chmod 0 /bin/systemctl;cd /helpers; sh build.sh; cd /; rm -rf helpers;chmod 755 /bin/systemctl

From 8ebf087e8ab8eeb18b3f73c3080660f6cfa117c3 Mon Sep 17 00:00:00 2001
From: Brianna Bennett <brbennett@mnx.io>
Date: Fri, 17 Jan 2025 09:51:10 -0800
Subject: [PATCH 2/4] ubuntu24 needs more systemd

---
 .github/workflows/build.yaml | 1 -
 ubuntu/Dockerfile            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 565d47c..22314c6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -38,7 +38,6 @@ jobs:
                     - 24.04
                     - 22.04
                     - 20.04
-                    - 18.04
 
         name: Build Ubuntu ${{ matrix.RELEASE }}
         runs-on: ubuntu-latest
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index dc2cef7..3f76ef9 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -2,5 +2,5 @@ ARG UBUNTU_RELEASE
 FROM ubuntu:${UBUNTU_RELEASE}
 COPY helpers /helpers
 ARG UBUNTU_RELEASE=${UBUNTU_RELEASE}
-RUN apt-get update && apt-get install -y systemd
+RUN apt-get update && apt-get install -y systemd systemd-sysv systemd-timesyncd libnss-systemd libpam-systemd libsystemd0 networkd-dispatcher
 RUN chmod 0 /bin/systemctl;cd /helpers; sh build.sh; cd /; rm -rf helpers;chmod 755 /bin/systemctl

From 042508ba8085eec79136f8b92ba3106a9c05f7b4 Mon Sep 17 00:00:00 2001
From: Brianna Bennett <brbennett@mnx.io>
Date: Mon, 20 Jan 2025 10:55:49 -0800
Subject: [PATCH 3/4] Restore "unminimize" command for ubuntu24

---
 ubuntu/helpers/build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ubuntu/helpers/build.sh b/ubuntu/helpers/build.sh
index 4b3e2be..97de722 100755
--- a/ubuntu/helpers/build.sh
+++ b/ubuntu/helpers/build.sh
@@ -5,6 +5,9 @@ echo Installing Ubuntu $UBUNTU_RELEASE
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
 apt-get install -yq apt-utils
+if ! command -v unminimize; then
+    apt-get install -yq unminimize
+fi
 yes | unminimize
 apt-get install -yq \
     systemd-sysv \

From 40677d8a01972c2e4dbac14a8180338fbce37d2c Mon Sep 17 00:00:00 2001
From: Brianna Bennett <brbennett@mnx.io>
Date: Wed, 29 Jan 2025 10:01:30 -0800
Subject: [PATCH 4/4] Get ready for PR

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 22314c6..53bc22c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,7 +7,6 @@ on:
             - '**.md'
         branches:
             - master
-            - 202501
 jobs:
     prepare:
         name: Create Release
@@ -38,6 +37,7 @@ jobs:
                     - 24.04
                     - 22.04
                     - 20.04
+                    - 18.04
 
         name: Build Ubuntu ${{ matrix.RELEASE }}
         runs-on: ubuntu-latest