Skip to content
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.

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

ecs-gpu-init: fix unit dependencies on GPU drivers #166

Merged
merged 1 commit into from
Sep 28, 2024

Conversation

bcressey
Copy link
Contributor

@bcressey bcressey commented Sep 28, 2024

Issue number:
N/A

Description of changes:
The GPU driver functionality has split into two units, one for the proprietary driver and one for the open one. Depending on the version of the driver, one or both units might be present.

Update the dependencies to reflect this. Also drop the "Requires", as the "After" ordering should be sufficient, and "Requires" will cause a failure if the unit is not installed.

Testing done:
Tested aws-ecs-1-nvidia and aws-ecs-2-nvidia. Both came up successfully.

Ordering on aws-ecs-1-nvidia:

         Starting Load additional kernel modules...
[  OK  ] Finished Load additional kernel modules.
         Starting Initialize ECS GPU config...
[  OK  ] Finished Initialize ECS GPU config.

Ordering on aws-ecs-2-nvidia:

         Starting Load Tesla kernel modules...
[  OK  ] Finished Load Tesla kernel modules.
         Starting Initialize ECS GPU config...
[  OK  ] Finished Initialize ECS GPU config.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

The GPU driver functionality has split into two units, one for the
proprietary driver and one for the open one. Depending on the version
of the driver, one or both units might be present.

Update the dependencies to reflect this. Also drop the "Requires", as
the "After" ordering should be sufficient, and "Requires" will cause
a failure if the unit is not installed.

Signed-off-by: Ben Cressey <bcressey@amazon.com>
@bcressey bcressey marked this pull request as ready for review September 28, 2024 20:13
Copy link
Contributor

@yeazelm yeazelm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice fix! LGTM!

@bcressey bcressey merged commit 3c6ca27 into bottlerocket-os:develop Sep 28, 2024
2 checks passed
@bcressey bcressey deleted the fix-ecs-gpu-init-deps branch September 28, 2024 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants