From 492e5f6effc634c429f5e4ec6b349a54a93cdfce Mon Sep 17 00:00:00 2001 From: "Daniel J. Pritchett" Date: Sat, 3 May 2025 10:32:17 -0500 Subject: [PATCH 1/4] modifies systemd check in bootstrap to pass if it finds either systemd OR systemctl --- bootstrap/bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py index 75072f4c..2478b882 100644 --- a/bootstrap/bootstrap.py +++ b/bootstrap/bootstrap.py @@ -229,7 +229,7 @@ def ensure_host_system_can_install_tljh(): sys.exit(1) # Require systemd (systemctl is a part of systemd) - if not shutil.which("systemd") or not shutil.which("systemctl"): + if not any([shutil.which("systemctl"), shutil.which("systemd")]): print("Systemd is required to run TLJH") # Provide additional information about running in docker containers if os.path.exists("/.dockerenv"): From 603ab5870d3d93db13d5044e93ba9f2953f12e6c Mon Sep 17 00:00:00 2001 From: "Daniel J. Pritchett" Date: Sat, 3 May 2025 10:41:31 -0500 Subject: [PATCH 2/4] Adds Ubuntu 24.10/py3.12 to test matrix --- .github/workflows/integration-test.yaml | 3 +++ bootstrap/bootstrap.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 88eb72ce..85cc76bc 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -45,6 +45,9 @@ jobs: - name: "Ubuntu 24.04 Py 3.12" distro_image: "ubuntu:24.04" extra_flags: "" + - name: "Ubuntu 24.10 Py 3.12" + distro_image: "ubuntu:24.10" + extra_flags: "" - name: "Ubuntu 22.04, Py 3.10, from main" distro_image: "ubuntu:22.04" extra_flags: --upgrade-from=main diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py index 2478b882..e8b2c958 100644 --- a/bootstrap/bootstrap.py +++ b/bootstrap/bootstrap.py @@ -204,6 +204,12 @@ def get_os_release_variable(key): .strip() ) +def host_has_systemd() -> bool: + if shutil.which("systemd"): + return True + if shutil.which("systemctl"): + return True + return False def ensure_host_system_can_install_tljh(): """ From c69ea5ed816ce93ea7a3cf289a37cb1afd55d897 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 3 May 2025 15:42:04 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- bootstrap/bootstrap.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py index e8b2c958..93341f2c 100644 --- a/bootstrap/bootstrap.py +++ b/bootstrap/bootstrap.py @@ -204,6 +204,7 @@ def get_os_release_variable(key): .strip() ) + def host_has_systemd() -> bool: if shutil.which("systemd"): return True @@ -211,6 +212,7 @@ def host_has_systemd() -> bool: return True return False + def ensure_host_system_can_install_tljh(): """ Check if TLJH is installable in current host system and exit with a clear From 515fc870cc33a29008bc9a18fe4940c4b0be69fc Mon Sep 17 00:00:00 2001 From: "Daniel J. Pritchett" Date: Sun, 4 May 2025 09:58:13 -0500 Subject: [PATCH 4/4] Remove unused function for PR --- bootstrap/bootstrap.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py index 93341f2c..2478b882 100644 --- a/bootstrap/bootstrap.py +++ b/bootstrap/bootstrap.py @@ -205,14 +205,6 @@ def get_os_release_variable(key): ) -def host_has_systemd() -> bool: - if shutil.which("systemd"): - return True - if shutil.which("systemctl"): - return True - return False - - def ensure_host_system_can_install_tljh(): """ Check if TLJH is installable in current host system and exit with a clear