Skip to content

Allows boostrap systemd check to pass if either systemd or systemctl are found #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Allows boostrap systemd check to pass if either systemd or systemctl are found #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
492e5f6
modifies systemd check in bootstrap to pass if it finds either system…
dpritchett May 3, 2025
603ab58
Adds Ubuntu 24.10/py3.12 to test matrix
dpritchett May 3, 2025
c69ea5e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 3, 2025
515fc87
Remove unused function for PR
dpritchett May 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/integration-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"):
Expand Down