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

feat(systemd*): include systemd config files from /usr/lib/systemd (bsc#1228398) #363

Merged
merged 2 commits into from
Aug 20, 2024

Conversation

aafeijoo-suse
Copy link
Collaborator

and also use proper variables for the paths.

Ref: https://issues.redhat.com/browse/RHEL-32506

(cherry picked from commit dracut-ng/dracut-ng@6c99c07)

pvalena and others added 2 commits August 19, 2024 11:00
…sc#1228398)

and also use proper variables for the paths.

--

The new systemd reads from both /etc and /usr/, so to accomodate this,
I've added new paths to install configs from (I probably haven't covered
all). This changes only hostonly behaviour; uses global variables:

systemdutilconfdir: "/etc/systemd"
systemdutildir: "/lib/systemd:/lib/systemd/systemd-udevd" "/usr/lib/systemd:/usr/lib/systemd/systemd-udevd"

Ref: https://issues.redhat.com/browse/RHEL-32506
(cherry picked from commit dracut-ng/dracut-ng@6c99c07)
Copy link
Collaborator

@tblume tblume left a comment

Choose a reason for hiding this comment

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

Looking into the manpage of systemd-resolved, I'm pretty sure that /etc/systemd/resolv.conf doesn't exist.
However, I saw your communication upstream.
If RH needs it for compatibility, I have no objection.

@aafeijoo-suse
Copy link
Collaborator Author

Looking into the manpage of systemd-resolved, I'm pretty sure that /etc/systemd/resolv.conf doesn't exist. However, I saw your communication upstream. If RH needs it for compatibility, I have no objection.

Me too, but my upstream review was ignored ;)

dracut-ng/dracut-ng#511 (comment)

I just cherry-picked the original upstream commit as is because it's on a inst_multiple -o, so if it doesn't exist it doesn't fail. But yeah, I don't think this file exists.

@aafeijoo-suse aafeijoo-suse merged commit 49307b2 into openSUSE:SUSE/059 Aug 20, 2024
2 checks passed
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