public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Dennis Gilmore <dennis@ausil.us>
To: git-commits@fedoraproject.org
Subject: [rpms/fedora-release] f45: Make /etc/issue configurable per-edition
Date: Mon, 10 Aug 2026 09:34:10 GMT [thread overview]
Message-ID: <178635445038.1.1624335166845878818.rpms-fedora-release-294e7881c574@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fedora-release
Branch : f45
Commit : 294e7881c574f6765dc7ae37b6d78cf95122d5b3
Author : Dennis Gilmore <dennis@ausil.us>
Date : 2015-09-08T07:05:11-05:00
Stats : +46/-9 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/fedora-release/c/294e7881c574f6765dc7ae37b6d78cf95122d5b3?branch=f45
Log:
Make /etc/issue configurable per-edition
- Resolves: RHBZ#1239089
---
diff --git a/fedora-release.spec b/fedora-release.spec
index a091002..f21525a 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -5,7 +5,7 @@
Summary: Fedora release files
Name: fedora-release
Version: 24
-Release: 0.1
+Release: 0.2
License: MIT
Group: System Environment/Base
URL: http://fedoraproject.org
@@ -80,10 +80,8 @@ sed -i 's|@@VERSION@@|%{dist_version}|g' Fedora-Legal-README.txt
install -d $RPM_BUILD_ROOT/etc
echo "Fedora release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
echo "cpe:/o:fedoraproject:fedora:%{version}" > $RPM_BUILD_ROOT/etc/system-release-cpe
-cp -p $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
-echo "Kernel \r on an \m (\l)" >> $RPM_BUILD_ROOT/etc/issue
-cp -p $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
-echo >> $RPM_BUILD_ROOT/etc/issue
+
+# Symlink the -release files
ln -s fedora-release $RPM_BUILD_ROOT/etc/redhat-release
ln -s fedora-release $RPM_BUILD_ROOT/etc/system-release
@@ -106,7 +104,17 @@ REDHAT_SUPPORT_PRODUCT_VERSION=%{bug_version}
PRIVACY_POLICY_URL=https://fedoraproject.org/wiki/Legal:PrivacyPolicy
EOF
-# Create os-release files for the different editions
+# Create the common /etc/issue
+echo "\S" > $RPM_BUILD_ROOT/usr/lib/os.release.d/issue-fedora
+echo "Kernel \r on an \m (\l)" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/issue-fedora
+echo >> $RPM_BUILD_ROOT/usr/lib/os.release.d/issue-fedora
+
+# Create /etc/issue.net
+echo "\S" > $RPM_BUILD_ROOT/usr/lib/issue.net
+echo "Kernel \r on an \m (\l)" >> $RPM_BUILD_ROOT/usr/lib/issue.net
+ln -s ../usr/lib/issue.net $RPM_BUILD_ROOT/etc/issue.net
+
+# Create os-release and issue files for the different editions
# Cloud
cp -p $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-fedora \
$RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-cloud
@@ -121,6 +129,11 @@ echo "VARIANT=\"Server Edition\"" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-rel
echo "VARIANT_ID=server" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-server
sed -i -e "s|(%{release_name})|(Server Edition)|g" $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-server
+cp -p $RPM_BUILD_ROOT/usr/lib/os.release.d/issue-fedora \
+ $RPM_BUILD_ROOT/usr/lib/os.release.d/issue-server
+echo "Admin Console: https://\4:9090/ or https://\6:9090/" >> $RPM_BUILD_ROOT/usr/lib/os.release.d/issue-server
+echo >> $RPM_BUILD_ROOT/usr/lib/os.release.d/issue-server
+
# Workstation
cp -p $RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-fedora \
$RPM_BUILD_ROOT/usr/lib/os.release.d/os-release-workstation
@@ -135,6 +148,13 @@ sed -i -e "s|(%{release_name})|(Workstation Edition)|g" $RPM_BUILD_ROOT/usr/lib/
ln -s ../usr/lib/os-release $RPM_BUILD_ROOT/etc/os-release
ln -s os.release.d/os-release-fedora $RPM_BUILD_ROOT/usr/lib/os-release
+# Create the symlink for /etc/issue
+# This will be standard until %post when the
+# release packages will link the appropriate one into
+# /usr/lib/os-release
+ln -s ../usr/lib/issue $RPM_BUILD_ROOT/etc/issue
+ln -s os.release.d/issue-fedora $RPM_BUILD_ROOT/usr/lib/issue
+
# Set up the dist tag macros
install -d -m 755 $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d
cat >> $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.dist << EOF
@@ -206,6 +226,12 @@ fi
ln -sf ./os.release.d/os-release-server /usr/lib/os-release || :
fi
+ # If issue isn't a link or it exists but it points to a
+ # non-productized version, replace it with this one
+ if [ \! -h /usr/lib/issue -o "x$(readlink /usr/lib/issue)" = "xos.release.d/issue-fedora" ]; then
+ ln -sf ./os.release.d/issue-server /usr/lib/issue || :
+ fi
+
if [ $1 -eq 1 ] ; then
# Initial installation
@@ -223,6 +249,9 @@ if [ $1 = 0 ]; then
# with a symlink to basic version
test -e /usr/lib/os-release || \
ln -sf ./os.release.d/os-release-fedora /usr/lib/os-release || :
+
+ test -e /usr/lib/issue || \
+ ln -sf ./os.release.d/issue-fedora /usr/lib/issue || :
fi
%post workstation
@@ -274,8 +303,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
/etc/redhat-release
/etc/system-release
%config %attr(0644,root,root) /etc/system-release-cpe
-%config(noreplace) %attr(0644,root,root) /etc/issue
-%config(noreplace) %attr(0644,root,root) /etc/issue.net
+%config %attr(0644,root,root) /usr/lib/os.release.d/issue-fedora
+/usr/lib/issue
+/etc/issue
+%config %attr(0644,root,root) /usr/lib/issue.net
+/etc/issue.net
%attr(0644,root,root) %{_rpmconfigdir}/macros.d/macros.dist
%dir /usr/lib/systemd/user-preset/
%dir %{_prefix}/lib/systemd/system-preset/
@@ -293,6 +325,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{!?_licensedir:%global license %%doc}
%license LICENSE
%config %attr(0644,root,root) /usr/lib/os.release.d/os-release-server
+%config %attr(0644,root,root) /usr/lib/os.release.d/issue-server
%{_prefix}/lib/systemd/system-preset/80-server.preset
%files workstation
@@ -303,5 +336,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_prefix}/lib/systemd/system-preset/80-workstation.preset
%changelog
+* Mon Aug 24 2015 Stephen Gallagher <sgallagh@redhat.com> 24-0.2
+- Make /etc/issue configurable per-edition
+- Resolves: RHBZ#1239089
+
* Tue Jul 14 2015 Dennis Gilmore <dennis@ausil.us> - 24-0.1
- setup for rawhide being f24
diff --git a/sources b/sources
index c173700..98de1da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86f850f1221edb4306960aaa5ffe4da1 fedora-release-24.tar.bz2
+5eaa3ddd121b43d62e6e668faff2e239 fedora-release-24.tar.bz2
reply other threads:[~2026-08-10 9:34 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=178635445038.1.1624335166845878818.rpms-fedora-release-294e7881c574@fedoraproject.org \
--to=dennis@ausil.us \
--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