Skip to content

systemd: used drop-ins for configuration#829

Merged
yarda merged 1 commit intoredhat-performance:masterfrom
yarda:systemd-dropins
Mar 19, 2026
Merged

systemd: used drop-ins for configuration#829
yarda merged 1 commit intoredhat-performance:masterfrom
yarda:systemd-dropins

Conversation

@yarda
Copy link
Contributor

@yarda yarda commented Mar 3, 2026

Resolves: RHEL-97580

@yarda
Copy link
Contributor Author

yarda commented Mar 3, 2026

/packit build

1 similar comment
@yarda
Copy link
Contributor Author

yarda commented Mar 3, 2026

/packit build

Copy link
Contributor

@Fothsid Fothsid left a comment

Choose a reason for hiding this comment

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

LGTM, see comment.

%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/tuned/bootcmdline
%verify(not size mtime md5) %{_sysconfdir}/modprobe.d/tuned.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=2444143
%dir %{_sysconfdir}/systemd/system.conf.d
Copy link
Contributor

Choose a reason for hiding this comment

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

Assuming this will be there until the systemd package actually starts to provide the system.conf.d directory?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I hope they will add it. If not, we can keep it. Even in case they add it and we forget to drop it, it will be still according to the Fedora packaging guidelines, because co-ownership of directories is allowed.

@yarda yarda force-pushed the systemd-dropins branch from 4705335 to 506b73d Compare March 5, 2026 16:09
@yarda
Copy link
Contributor Author

yarda commented Mar 5, 2026

@Fothsid I improved the PR a bit, now it tries to create the systemd template (if it doesn't exist) which may help in cases where the template is not installed. Please re-review.

Copy link
Contributor

@Fothsid Fothsid left a comment

Choose a reason for hiding this comment

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

LGTM.

@@ -0,0 +1 @@
[Manager]
Copy link
Contributor

Choose a reason for hiding this comment

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

Wouldn't this file be completely unnecessary after the change?

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually, I guess it's still useful to have it there so that it is removed together with the whole package and wouldn't leave a random configuration file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, I guess it's still useful to have it there so that it is removed together with the whole package and wouldn't leave a random configuration file.

Yes, it's always better to have the package manager to handle it - it will also backup the file in case user already has there his own configuration file with the same name.

The code in the plugin is just a fallback for special cases when the template file is not installed by RPM or make install, e.g. it could happen on some non RPM distro. IMHO in such case it's better if the plugin works OK and creates the file that could be a leftover later than if it doesn't work.

@yarda yarda force-pushed the systemd-dropins branch 2 times, most recently from 7f3f9cd to f3b3900 Compare March 19, 2026 16:42
Resolves: RHEL-97580

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
@yarda yarda force-pushed the systemd-dropins branch from f3b3900 to a8a9d38 Compare March 19, 2026 16:45
@yarda
Copy link
Contributor Author

yarda commented Mar 19, 2026

Fixed conflict and rebased onto master.

Copy link
Contributor

@Fothsid Fothsid left a comment

Choose a reason for hiding this comment

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

LGTM

@yarda yarda merged commit eb86a14 into redhat-performance:master Mar 19, 2026
18 checks passed
@yarda yarda deleted the systemd-dropins branch March 19, 2026 17:06
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.

2 participants