diff --git a/convert-to-edition b/convert-to-edition index 6bc9ea4..5c18634 100755 --- a/convert-to-edition +++ b/convert-to-edition @@ -65,9 +65,6 @@ case $EDITION in # Ensure that the os-release file is pointing to the correct version ln -sf ./os.release.d/os-release-atomichost /usr/lib/os-release || : - # Ensure that the issue file is pointing to the correct version - ln -sf ./os.release.d/issue-fedora /usr/lib/issue - # Remove any presets from other Editions. rm -f /usr/lib/systemd/system-preset/80-*.preset ;; @@ -83,9 +80,6 @@ case $EDITION in # Ensure that the os-release file is pointing to the correct version ln -sf ./os.release.d/os-release-cloud /usr/lib/os-release || : - # Ensure that the issue file is pointing to the correct version - ln -sf ./os.release.d/issue-fedora /usr/lib/issue - # Remove any presets from other Editions. rm -f /usr/lib/systemd/system-preset/80-*.preset ;; @@ -96,9 +90,6 @@ case $EDITION in # Ensure that the os-release file is pointing to the correct version ln -sf ./os.release.d/os-release-fedora /usr/lib/os-release || : - # Ensure that the issue file is pointing to the correct version - ln -sf ./os.release.d/issue-fedora /usr/lib/issue - # Remove any presets from other Editions. rm -f /usr/lib/systemd/system-preset/80-*.preset ;; @@ -111,10 +102,8 @@ case $EDITION in echo "VARIANT_ID=server" > $VARIANT_FILE - # Ensure that the os-release and issue files are pointing to the correct - # version + # Ensure that the os-release file is pointing to the correct version ln -sf ./os.release.d/os-release-server /usr/lib/os-release - ln -sf ./os.release.d/issue-server /usr/lib/issue # Remove any presets from other Editions. This should always be a no-op, # but it's good to be explicit. @@ -145,10 +134,8 @@ case $EDITION in fi echo "VARIANT_ID=workstation" > $VARIANT_FILE - # Ensure that the os-release and issue files are pointing to the correct - # version + # Ensure that the os-release files is pointing to the correct version ln -sf ./os.release.d/os-release-workstation /usr/lib/os-release - ln -sf ./os.release.d/issue-fedora /usr/lib/issue # Remove any presets from other Editions. This should always be a no-op, # but it's good to be explicit. diff --git a/convert-to-edition.lua b/convert-to-edition.lua index 65fe87c..99633a2 100644 --- a/convert-to-edition.lua +++ b/convert-to-edition.lua @@ -100,28 +100,24 @@ local function set_release(release) symlink("./os.release.d/os-release-" .. release, "/usr/lib/os-release") end -local function set_issue(release) - symlink("./os.release.d/issue-" .. release, "/usr/lib/issue") -end -- release: the VARIANT_ID for os-release --- issue: which /etc/issue file to install -- presets: whether this edition has extra presets beyond the -- defaults to enable or disable local variants = { - atomichost = {release = "atomichost", issue = "fedora", presets = false}, - cloud = {release = "cloud", issue = "fedora", presets = false}, - cinnamon = {release = "cinnamon", issue = "fedora", presets = false}, - container = {release = "container", issue = "fedora", presets = false}, - coreos = {release = "coreos", issue = "fedora", presets = false}, - iot = {release = "iot", issue = "fedora", presets = true}, - kde = {release = "kde", issue = "fedora", presets = false}, - matecompiz = {release = "matecompiz", issue = "fedora", presets = false}, - nonproduct = {release = "fedora", issue = "fedora", presets = false}, - server = {release = "server", issue = "server", presets = true}, - silverblue = {release = "silverblue", issue = "fedora", presets = false}, - soas = {release = "soas", issue = "fedora", presets = false}, - workstation = {release = "workstation", issue = "fedora", presets = true}, - xfce = {release = "xfce", issue = "fedora", presets = false}, + atomichost = {release = "atomichost", presets = false}, + cloud = {release = "cloud", presets = false}, + cinnamon = {release = "cinnamon", presets = false}, + container = {release = "container", presets = false}, + coreos = {release = "coreos", presets = false}, + iot = {release = "iot", presets = true}, + kde = {release = "kde", presets = false}, + matecompiz = {release = "matecompiz", presets = false}, + nonproduct = {release = "fedora", presets = false}, + server = {release = "server", presets = true}, + silverblue = {release = "silverblue", presets = false}, + soas = {release = "soas", presets = false}, + workstation = {release = "workstation", presets = true}, + xfce = {release = "xfce", presets = false}, } -- Call out to systemctl to enable or disable presets @@ -156,7 +152,6 @@ local function convert_to_edition(edition, apply_presets) error("undefined edition: " .. edition) end set_release(variant.release) - set_issue(variant.issue) clear_presets() set_presets(edition, apply_presets) diff --git a/fedora-release.spec b/fedora-release.spec index 9ea610c..9b3fbeb 100644 --- a/fedora-release.spec +++ b/fedora-release.spec @@ -238,16 +238,17 @@ PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" EOF # Create the common /etc/issue -echo "\S" > %{buildroot}/usr/lib/os.release.d/issue-fedora -echo "Kernel \r on an \m (\l)" >> %{buildroot}/usr/lib/os.release.d/issue-fedora -echo >> %{buildroot}/usr/lib/os.release.d/issue-fedora +echo "\S" > %{buildroot}/usr/lib/issue +echo "Kernel \r on an \m (\l)" >> %{buildroot}/usr/lib/issue +echo >> %{buildroot}/usr/lib/issue +ln -s ../usr/lib/issue %{buildroot}/etc/issue # Create /etc/issue.net echo "\S" > %{buildroot}/usr/lib/issue.net echo "Kernel \r on an \m (\l)" >> %{buildroot}/usr/lib/issue.net ln -s ../usr/lib/issue.net %{buildroot}/etc/issue.net -# Create os-release and issue files for the different editions +# Create os-release files for the different editions # Atomic Host - https://bugzilla.redhat.com/show_bug.cgi?id=1200122 cp -p %{buildroot}/usr/lib/os.release.d/os-release-fedora \ @@ -312,11 +313,6 @@ echo "VARIANT=\"Server Edition\"" >> %{buildroot}/usr/lib/os.release.d/os-releas echo "VARIANT_ID=server" >> %{buildroot}/usr/lib/os.release.d/os-release-server sed -i -e "s|(%{release_name})|(Server Edition)|g" %{buildroot}/usr/lib/os.release.d/os-release-server -cp -p %{buildroot}/usr/lib/os.release.d/issue-fedora \ - %{buildroot}/usr/lib/os.release.d/issue-server -echo "Admin Console: https://\4:9090/ or https://[\6]:9090/" >> %{buildroot}/usr/lib/os.release.d/issue-server -echo >> %{buildroot}/usr/lib/os.release.d/issue-server - # Silverblue cp -p %{buildroot}/usr/lib/os.release.d/os-release-fedora \ %{buildroot}/usr/lib/os.release.d/os-release-silverblue @@ -350,11 +346,6 @@ sed -i -e "s|(%{release_name})|(Xfce)|g" %{buildroot}/usr/lib/os.release.d/os-re # so that we can ensure that the right one is referenced. ln -s ../usr/lib/os-release %{buildroot}/etc/os-release -# Create the symlink for /etc/issue -# We don't create the /usr/lib/os-release symlink until %%post -# so that we can ensure that the right one is referenced. -ln -s ../usr/lib/issue %{buildroot}/etc/issue - # Set up the dist tag macros install -d -m 755 %{buildroot}%{_rpmconfigdir}/macros.d cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF @@ -402,7 +393,6 @@ install -Dm0755 %{SOURCE3} -t %{buildroot}/%{_prefix}/sbin/ -- to os-release-fedora. if arg[2] == "0" then set_release(fedora) - set_issue(fedora) end -- We also want to forcibly set these paths on upgrade if we are explicitly @@ -542,8 +532,7 @@ uninstall_edition("xfce") /etc/redhat-release /etc/system-release %config %attr(0644,root,root) /etc/system-release-cpe -%attr(0644,root,root) /usr/lib/os.release.d/issue-fedora -%ghost /usr/lib/issue +%attr(0644,root,root) /usr/lib/issue %config(noreplace) /etc/issue %attr(0644,root,root) /usr/lib/issue.net %config(noreplace) /etc/issue.net @@ -584,7 +573,6 @@ uninstall_edition("xfce") %files server %attr(0644,root,root) /usr/lib/os.release.d/os-release-server -%attr(0644,root,root) /usr/lib/os.release.d/issue-server %ghost %{_prefix}/lib/systemd/system-preset/80-server.preset %attr(0644,root,root) /usr/lib/os.release.d/presets/80-server.preset