Repository navigation
Conversation
/home becomes an empty directory in the image and Dakota's home.mount (files/bindmounts/home.mount) binds /var/home over it, so /home/<user> is the real path rather than a symlink into /var. Dakota's bluefin-migrate-var-home-passwd rewrites legacy /var/home/<user> passwd fields; Utah's copy fixes the fast-path regex that kept Dakota's from ever matching a user entry (projectbluefin/dakota#1491). The build fails if anything lands in the image's /home, home.mount skips when /var/home is missing, and the live ISO writes liveuser's files under /var/home and points its passwd field at /home/liveuser. Closes #1234 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hanthor 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 |
Contributor
|
Withdrawn: this PR is not back in your court after all. The failing checks ( |
Member
Author
|
Folded into the part-2 landing PR (fold/dakota-sq) with this change unchanged apart from rebase and conflict resolution. Closing here; review continues there. |
This file contains hidden or 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
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.
This adopts Dakota's
/homelayout (owner decision on #1234)./homebecomes an empty directory in the image, and/var/homeis bind-mounted over it. A one-shot unit rewrites legacy/var/home/<user>passwd fields to/home/<user>.What changed
home.mountcomes from Dakota'sfiles/bindmounts/home.mount(elements/bluefin/bindmounts.bst), with the staticlocal-fs.target.wantslink.ConditionPathIsDirectory=/var/home. When there's nothing to bind, the unit is skipped instead of failing, andutah-home.confrecreates the directory for the next boot.root.mountandsnap.mountare not part of this change./rootstays Hummingbird'svar/roothomesymlink.bluefin-migrate-var-home-passwd(script, service and80-…preset) comes from Dakota'smigrate-var-home-passwd.bst, with one fix.:(/var/home/|/var/roothome)(:|$)only matches a bare/var/home/field. On a/var/home/<user>entry the script exits before migrating anything; only/var/roothomewould ever be rewritten. This is [quality] bluefin-migrate-var-home-passwd never migrates /var/home/<user> — grep fast-path regex requires ':' right after the trailing slash dakota#1491, which is closed whiletestingstill carries the bug./var/home/[^:]+. Tested in the Hummingbird image:/var/home/alicebecomes/home/alice,/home/bobis untouched, and a second run is a no-op.Containerfile: the final clean/lint RUN replaces Hummingbird's/home -> var/homesymlink with an empty0755directory. The build fails if anything is inside it, becausehome.mountwould hide it.bootc container lint --fatal-warningspasses with that layout: 13 checks passed, tried on the pinned bootc-os image.utah-home.conf(d /var/home) stays, with a corrected comment./var/homeis the bind source and still ships in the image.configure-live.shstill creates liveuser in/var/home/liveuser, because a build has no mounts. It then sets the passwd field to/home/liveuserand writesgnome-initial-setup-doneunder/var/home. Before this change it wrote to/home/liveuser/.config, which would land in the image's/homeand be hidden at boot.bluefin-migrate-var-home-passwd.serviceis enabled.tests/test_home_root.pycovers the mount, the Containerfile ordering, liveuser, and the migration script run against a stubusermod.containerfile.md,setup-hooks.md, the ChairLift reference anddakota-services.md.Installer risk (please read)
I checked fisherman
prod(tuna-os/fisherman@1232972,internal/post/user.go). On the ostree backend, which is what Utah's ISO uses, it creates the account withchroot <deployment> useradd --create-home./homewas a symlink, so the home landed in<deployment>/var/home/<user>, and fisherman moves it into the stateroot/var/home./homeis a real directory, so useradd writes the skel copy into<deployment>/home/<user>.home.mounthides that copy at boot. fisherman's move finds nothing to relocate./etc/tmpfiles.d/fisherman-home-<user>.conf(C /var/home/<user> 0700 … - /etc/skelplusZ), and the first boot builds the home from skel with correct owner and labels. The passwd field is/home/<user>, which the bind mount resolves./home/<user>before first boot is hidden. Today's fisherman writes nothing else there.<deployment>/home/<user>when/homeis a directory.useradd --root --no-create-homeplus the same tmpfiles rule, so they're unaffected.just luks-testexercises this whole path. I haven't run it locally, because it needs a built image and ISO. Please run the LUKS e2e before merging.Verification
just checkpasses (1348 tests).bootc container lintwith/homeas a directory in the pinned bootc-os image.Stacked on #1292 (
feat/dakota-zswap).Closes #1234