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

Adding Umask= key to Quadlet .container files. #25293

Closed
wants to merge 0 commits into from

Conversation

geraveoyomama
Copy link

@geraveoyomama geraveoyomama commented Feb 11, 2025

Does this PR introduce a user-facing change?

Adds the Umask= key for .container is added to the quadlet generator.

Closes #25278

Copy link
Member

@Luap99 Luap99 left a 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]`
Copy link
Member

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]?

@@ -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")
Copy link
Member

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

@@ -2220,3 +2223,4 @@ func addDefaultDependencies(service *parser.UnitFile, isUser bool) {
service.PrependUnitLine(UnitGroup, "Wants", networkUnit)
}
}

Copy link
Member

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

@geraveoyomama
Copy link
Author

geraveoyomama commented Feb 11, 2025

Fixed (I hope)

@rhatdan
Copy link
Member

rhatdan commented Feb 11, 2025

LGTM

@Luap99
Copy link
Member

Luap99 commented Feb 11, 2025

please squash your commits into one

@mheon
Copy link
Member

mheon commented Feb 11, 2025

Code/tests LGTM once commits are squashed

@Luap99
Copy link
Member

Luap99 commented Feb 11, 2025

@geraveoyomama

Use git rebase -i HEAD~5 then in the test editor change the last 4 pick xxxx commit title lines to s xxxx commit title then save and exit the editor this makes git squash all commits into one. And then the first commit also need a sign off line added. Once you have only one commit you can do git commit -s --amend

Then you also need to rebase on main to fix the CI issue with git pull --rebase upstream main or similar commands. That assume you have configured podman as upstream remote in git.

Hope this helps

@geraveoyomama
Copy link
Author

Okay, thank you, I learned some more today :).

I followed you instructions carefully so that should be it.

@ygalblum
Copy link
Contributor

@geraveoyomama Please see @Luap99's comment: #25293 (comment) about squashing and signing off the commit

@geraveoyomama
Copy link
Author

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

Copy link
Contributor

openshift-ci bot commented Feb 19, 2025

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@geraveoyomama
Copy link
Author

whoa that was not supposed to happen

@geraveoyomama
Copy link
Author

geraveoyomama commented Feb 19, 2025

opening again soon

EDIT: or not?? Continued in #25369

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Umask=xxxx option to replace PodmanArgs=--umask=xxxx
5 participants