public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Stephen Gallagher <sgallagh@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/fedora-release] f45: ELN: Add preset override file
Date: Mon, 10 Aug 2026 09:36:33 GMT	[thread overview]
Message-ID: <178635459378.1.807753193114508852.rpms-fedora-release-c38ff564279c@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : c38ff564279cde7125dd68e28bd55f26a3d7b7b0
            Author : Stephen Gallagher <sgallagh@redhat.com>
            Date   : 2024-05-29T18:31:43+00:00
            Stats  : +11/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/c38ff564279cde7125dd68e28bd55f26a3d7b7b0?branch=f45

            Log:
            ELN: Add preset override file

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

---
diff --git a/75-eln.preset b/75-eln.preset
new file mode 100644
index 0000000..1bdde76
--- /dev/null
+++ b/75-eln.preset
@@ -0,0 +1,6 @@
+#
+# Fedora ELN
+#
+# This file contains overrides/additions to the presets in Fedora common and
+# server that are specifically needed for RHEL/CentOS Stream.
+#

diff --git a/fedora-release.spec b/fedora-release.spec
index 498d83e..906d714 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -121,6 +121,7 @@ Source28:       longer-default-shutdown-timeout.conf
 Source29:       org.gnome.settings-daemon.plugins.power.gschema.override
 Source30:       fedora-sway.conf
 Source31:       20-fedora-defaults.conf
+Source32:       75-eln.preset
 
 BuildArch:      noarch
 
@@ -1387,6 +1388,9 @@ sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/ELN/;s/<!--.*-->//;/^$/d' %
 
 # ELN installs the Server presets as well
 install -Dm0644 %{SOURCE14} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
+
+# ELN may override some presets from Fedora to simplify branching for CentOS Stream
+install -Dm0644 %{SOURCE32} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
 %endif
 
 %if %{with iot}
@@ -1749,6 +1753,7 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
 %files identity-eln
 %{_prefix}/lib/os-release.eln
 %{_prefix}/lib/systemd/system-preset/80-server.preset
+%{_prefix}/lib/systemd/system-preset/75-eln.preset
 %attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.eln
 %endif
 

                 reply	other threads:[~2026-08-10  9:36 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178635459378.1.807753193114508852.rpms-fedora-release-c38ff564279c@fedoraproject.org \
    --to=sgallagh@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox