-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
Adding Umask= key to Quadlet .container files. #25293
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the PR
@@ -894,6 +895,15 @@ Ulimit options. Sets the ulimits values inside of the container. | |||
|
|||
This key can be listed multiple times. | |||
|
|||
### `Umask=` | |||
|
|||
Set the umask of the process. This is equivalent to the Podman `--umask` and generally has the form `[UMASK]` |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove the "and generally has the form [UMASK]
" part I don't see how this adds any value and what means form [UMASK]
?
test/e2e/quadlet_test.go
Outdated
@@ -910,6 +910,7 @@ BOGUS=foo | |||
Entry("sysctl.container", "sysctl.container"), | |||
Entry("timezone.container", "timezone.container"), | |||
Entry("ulimit.container", "ulimit.container"), | |||
Entry("umask.container", "umask.container") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
indentation looks wrong also you are missing a comma here at the end
pkg/systemd/quadlet/quadlet.go
Outdated
@@ -2220,3 +2223,4 @@ func addDefaultDependencies(service *parser.UnitFile, isUser bool) { | |||
service.PrependUnitLine(UnitGroup, "Wants", networkUnit) | |||
} | |||
} | |||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the newline must be removed
Fixed (I hope) |
LGTM |
please squash your commits into one |
Code/tests LGTM once commits are squashed |
Use Then you also need to rebase on main to fix the CI issue with Hope this helps |
Okay, thank you, I learned some more today :). I followed you instructions carefully so that should be it. |
@geraveoyomama Please see @Luap99's comment: #25293 (comment) about squashing and signing off the commit |
I think I will just redo the changes manualllly since its not that much work copying anyway. I simply cannot get it to behave even when following luap's instructions |
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: geraveoyomama The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
whoa that was not supposed to happen |
opening again soon EDIT: or not?? Continued in #25369 |
Does this PR introduce a user-facing change?
Closes #25278