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

bwrap: Use rofiles-fuse --copyup by default #1171

Closed
wants to merge 3 commits into from

Conversation

cgwalters
Copy link
Member

This fixes a large swath of compatibility issues, for the same reasons as
overlayfs makes a lot of things Just Work. The ugly part of course is
doing hidden copyups inside the filesystem.

We've gone quite a long time with the "pure rofiles" mode, and have made changes
to various bits of userspace to be compatible with it. But what finally made me
give up on that is glibc's locale-archive; there's a patch for it that
is stalled, but even if it was applied we would still need to work with
older glibc.

This issue comes to the fore in unified core 🌐 mode, as without this
we won't get a correct locale archive.

@cgwalters
Copy link
Member Author

Requires ostreedev/ostree#1382

This fixes a large swath of compatibility issues, for the same reasons as
overlayfs makes a lot of things Just Work.  The ugly part of course is
doing hidden copyups inside the filesystem.

We've gone quite a long time with the "pure rofiles" mode, and have made changes
to various bits of userspace to be compatible with it. But what finally made me
give up on that is glibc's locale-archive; there's a patch for it that
is stalled, but even if it was applied we would still need to work with
older glibc.

This issue comes to the fore in unified core 🌐 mode, as without this
we won't get a correct locale archive.
@cgwalters
Copy link
Member Author

Rebased 🏄‍♂️ and with tests ✅

@jlebon
Copy link
Member

jlebon commented Jan 8, 2018

LGTM, though:

Running post scripts... error: Running %post for rofiles-copyup: Executing bwrap(/bin/sh): Child process killed by signal 1; run journalctl -t 'rpm-ostree(rofiles-copyup.post)' for more information

Looking in the journal:

Jan 08 18:27:09 vmcheck2 rpm-ostree(rofiles-copyup.post)[6030]: /usr/rofiles-copyup.post: line 1: /usr/share/licenses/glibc/COPYING: No such file or directory
Jan 08 18:27:09 vmcheck2 rpm-ostree[6030]: Txn /org/projectatomic/rpmostree1/centos_atomic_host failed: Running %post for rofiles-copyup: Executing bwrap(/bin/sh): Child process killed by signal 1; run journalctl -t 'rpm-ostree(rofiles-copyup.post)' for more information

Looks like a difference between CentOS and Fedora AH:

[root@f27-ros ~]# rpm -q --docfiles glibc
/usr/share/doc/glibc/BUGS
/usr/share/doc/glibc/CONFORMANCE
/usr/share/doc/glibc/INSTALL
/usr/share/doc/glibc/NEWS
/usr/share/doc/glibc/README
/usr/share/doc/glibc/rtld-debugger-interface.txt

vs

[root@r7-tmp ~]# rpm -q --docfiles glibc
/usr/share/doc/glibc-2.17/BUGS
/usr/share/doc/glibc-2.17/CONFORMANCE
/usr/share/doc/glibc-2.17/COPYING
/usr/share/doc/glibc-2.17/COPYING.LIB
/usr/share/doc/glibc-2.17/INSTALL
/usr/share/doc/glibc-2.17/LICENSES
/usr/share/doc/glibc-2.17/NEWS
/usr/share/doc/glibc-2.17/PROJECTS
/usr/share/doc/glibc-2.17/README
/usr/share/doc/glibc-2.17/README.hesiod
/usr/share/doc/glibc-2.17/rtld-debugger-interface.txt

test_overwritepath=
for path in /usr/share/licenses/glibc/COPYING
/usr/share/systemd/kbd-model-map
/usr/share/rpm-ostree/treefile.json; do
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, these lines need to have their newlines escaped, no?
Let's just use /usr/share/rpm-ostree/treefile.json for all cases?

@jlebon
Copy link
Member

jlebon commented Jan 9, 2018

@rh-atomic-bot r+ ff3dfab

@rh-atomic-bot
Copy link

⌛ Testing commit ff3dfab with merge 84f0b01...

@rh-atomic-bot
Copy link

☀️ Test successful - status-papr
Approved by: jlebon
Pushing 84f0b01 to master...

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.

3 participants