Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

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

Merged
merged 1 commit into from
Mar 18, 2024

Conversation

mvo5
Copy link
Collaborator

@mvo5 mvo5 commented Mar 18, 2024

As a followup for #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 containers/bootc#358

As a followup for CentOS#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 containers/bootc#358
@mvo5 mvo5 changed the title basic-fixes: Tweak tmpfiles.d/rpm-ostree-0-integration.conf basic-fixes: Tweak basic-fixes: Tweak tmpfiles.d/provision.conf Mar 18, 2024
Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

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.

@mvo5
Copy link
Collaborator Author

mvo5 commented Mar 18, 2024

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 :)

@mvo5 mvo5 marked this pull request as ready for review March 18, 2024 14:03
@cgwalters cgwalters merged commit ecb0254 into CentOS:main Mar 18, 2024
7 checks passed
@mvo5 mvo5 deleted the fix-roothome branch March 18, 2024 14:59
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

--root-ssh-authorized-keys not work on the firstboot
2 participants