CentOS / centos-bootc

Create and maintain base bootable container images from Fedora ELN and CentOS Stream packages
https://centos.github.io/centos-bootc
Other
43 stars 28 forks source link

basic-fixes: Tweak basic-fixes: Tweak tmpfiles.d/provision.conf #440

Closed mvo5 closed 4 months ago

mvo5 commented 4 months ago

As a followup for https://github.com/CentOS/centos-bootc/pull/371 this PR tweaks tmpfiles.d/provision.conf so that there is only a single /var/roothome line for tmpfiles.d

As it is both provision.conf and rpm-ostree-0-integration.conf define the same dir.

This should fix https://github.com/containers/bootc/issues/358

mvo5 commented 4 months ago

Thanks, this looks sane.

I think what this is telling us is that it was a mistake to have a duplicate line for /var/roothome in rpm-ostree, we should have been working with systemd's from the start. So arguably we should do the deletion the other way?

But, not a big deal.

I started from the other way (i.e. removing it from rpm-ostree-0-integration.conf) but I'm too dumb^Winexperienced to get it right.

I tried to remove it from /usr/lib64/rpm-ostree/rpm-ostree-0-integration.conf but that had no effect (AFAICT), the file is also not (yet?) in /usr/lib/tmpfiles.d/rpm-ostree-0-integration.conf so I couldn't change it here.

I looked at the history of https://github.com/coreos/rpm-ostree/blame/main/src/app/rpm-ostree-0-integration.conf and saw that the line that adds /var/roothome is 11y old so I was a bit weary changing anything there :) This is why I ended up with the above diff but help to make this better would be super appreciated, I'm clearly missing some things here :)