distro(freebsd): add_user: respect homedir #5061
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
igalic
force-pushed
the
fbsd/adduser-home
branch
2 times, most recently
from
70de3fd to
2d88c4a
Compare
igalic
force-pushed
the
fbsd/adduser-home
branch
2 times, most recently
from
85589e2 to
042cdfe
Compare
holmanb
reviewed
Mar 15, 2024
cloudinit/distros/freebsd.py
Outdated
| ) | ||
| if "homedir" in kwargs: | ||
| homedir = kwargs["homedir"] | ||
| pw_useradd_cmd.append("-d{homedir}".format(homedir=homedir)) |
There was a problem hiding this comment.
Nit: This is a little verbose, I think the lines above could be simplified to the following:
homedir = kwargs.get("homedir", f"{self.home_dir}/{name}")
pw_useradd_cmd.append("-d" + homedir)
reportedly, passing `homedir` to a user struct doesn't actually change the homedir to the desired value. This is because we hard-code the path. Respect the value we are passed, and only make up a default when we don't get a `homedir`. Simplify style to remove cerimonious verbosity around strings, and amend tests to verify what we did. Sponsored by: The FreeBSD Foundation
igalic
force-pushed
the
fbsd/adduser-home
branch
from
042cdfe to
7c46bf0
Compare
holmanb
approved these changes
Mar 16, 2024
netgate-git-updates
pushed a commit
to pfsense/FreeBSD-ports
that referenced
this pull request
Apr 7, 2024
add homedir patch: canonical/cloud-init#5061 Also work around python.mk autoplist bug described in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=205056. Changelogs: - https://github.com/canonical/cloud-init/releases/tag/24.1 - https://github.com/canonical/cloud-init/releases/tag/24.1.1 - https://github.com/canonical/cloud-init/releases/tag/24.1.2 - https://github.com/canonical/cloud-init/releases/tag/24.1.3 - https://github.com/canonical/cloud-init/releases/tag/24.1.4 PR: 277708 Approved by: andrey@bsdnir.info (maintainer, timeout) Sponsored by: The FreeBSD Foundation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Commit Message
Additional Context
Test Steps
Checklist
Merge type