Merge pull request #44 from TritonDataCenter/ubuntu24

Add ubuntu 24.04
omniosorg · Jul 28, 2024 · d03bc94 · d03bc94
2 parents 1a0f772 + 3d274d2
commit d03bc94
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -34,6 +34,7 @@ jobs:
         strategy:
             matrix:
                 RELEASE:
+                    - 24.04
                     - 22.04
                     - 20.04
                     - 18.04

diff --git a/README.md b/README.md
@@ -7,6 +7,7 @@ Curently the following linuxes are supported
 * Ubuntu 18.04
 * Ubuntu 20.04
 * Ubuntu 22.04
+* Ubuntu 24.04
 * Debian Buster
 * Debian Bullseye
 * Devuan Beowulf

diff --git a/ubuntu/helpers/build.sh b/ubuntu/helpers/build.sh
@@ -91,6 +91,11 @@ systemctl enable create_hosts_file.service
 cp remove_dockerenv_file.service /etc/systemd/system
 systemctl enable remove_dockerenv_file.service
 
+# Revert systemd's tcp wrapper for ssh. This really only applies to 24.04,
+# but won't cause a failure on earlier versions.
+systemctl disable ssh.socket
+systemctl enable ssh.service
+
 # Remove the divert that disables services
 rm -f /sbin/initctl
 dpkg-divert --local --rename --remove /sbin/initctl
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ jobs: @@
             strategy:
                 matrix:
                     RELEASE:
+                        - 24.04
                         - 22.04
                         - 20.04
                         - 18.04
@@ Expand Down @@