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

fix: use rpm-ostreed-automatic.service drop-in to wait for network #93

Merged
merged 6 commits into from
Aug 12, 2023
Merged

fix: use rpm-ostreed-automatic.service drop-in to wait for network #93

merged 6 commits into from
Aug 12, 2023

Conversation

fiftydinar
Copy link
Contributor

@fiftydinar fiftydinar commented Aug 12, 2023

For fixing this issue:
#90

"Temporary failure in name resolution"

Override the service instead of making the changes directly.

Copy link
Contributor

@bsherman bsherman left a comment

Choose a reason for hiding this comment

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

I don't understand why this is adding a new file instead of modifying the existing service file.

I may truly be mistaken on this if we only currently customize the timer and not the service.

I am on mobile for a while and hard to review but I'll will check this when I'm back at the computer in a bit.

@akdev1l
Copy link

akdev1l commented Aug 12, 2023

mm two thoughts:

  1. does this change actually belong upstream? https://github.com/coreos/rpm-ostree/blob/main/src/daemon/rpm-ostreed-automatic.service - if the service needs that then we should also think about making a PR to rpm-ostree itself
  2. We should use a systemd drop-in to avoid clobbering the whole file. We can create a file in /usr/etc/systemd/system/rpm-ostreed-automatic.service.conf.d/override.conf with just this content:
[Unit]
Wants=network-online.target
After=network-online.target

this would have the effect of only setting these two properties while leaving everything else the same as upstream

(also @bsherman I checked and indeed we only have a .timer file currently)

@bsherman
Copy link
Contributor

(also @bsherman I checked and indeed we only have a .timer file currently)

Thanks for confirming, back and desk and I agree.

  1. We should use a systemd drop-in to avoid clobbering the whole file.

Hmm... now I wonder why I didn't use a system drop-in for the timer itself... that seems like I messed up.

@fiftydinar fiftydinar changed the title Create rpm-ostreed-automatic.service instead Create rpm-ostreed-automatic.service drop-in Aug 12, 2023
@bsherman bsherman changed the title Create rpm-ostreed-automatic.service drop-in fix: use rpm-ostreed-automatic.service drop-in to wait for network Aug 12, 2023
@bsherman bsherman merged commit efcd478 into ublue-os:main Aug 12, 2023
1 check passed
@fiftydinar fiftydinar deleted the fiftydinar-patch-1-1 branch August 12, 2023 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants