Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions base/comps/azurelinux-release/90-default.preset
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ enable auditd.service

enable audit-rules.service

# Backward-compat: override /proc/version so tools that grep for "Mariner"
# can identify Azure Linux
enable proc-version-override.service

# Locally-running service
enable restorecond.service

Expand Down Expand Up @@ -375,3 +371,4 @@ enable gpio-manager.service

# Enable authselect-apply-changes.service
enable authselect-apply-changes.service

14 changes: 5 additions & 9 deletions base/comps/azurelinux-release/azurelinux-release.spec
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Summary: Azure Linux release files
Name: azurelinux-release
Version: 4.0
# TODO(azl): Review whether we can move back to autorelease (with conditional -p)
Release: 10%{?dist}
Release: 11%{?dist}
License: MIT
URL: https://aka.ms/azurelinux

Expand All @@ -52,8 +52,7 @@ Source14: distro-template.swidtag
Source15: distro-variant-template.swidtag
Source16: 20-azurelinux-defaults.conf
Source17: 20-azure.conf
Source18: proc-version-override.service
Source19: proc-version-override.sh

Source20: chrony-azure.conf
Source21: 50-azure-cloud.conf
Source22: 70-azurelinux-hardening.conf
Expand Down Expand Up @@ -402,10 +401,6 @@ ln -s --relative %{buildroot}%{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swid
# Install DNF 5 configuration defaults
install -Dm0644 %{SOURCE16} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/

# Install proc-version-override (backward-compat for tools that grep /proc/version for "Mariner")
install -Dm0644 %{SOURCE18} -t %{buildroot}%{_unitdir}/
install -Dm0755 %{SOURCE19} %{buildroot}%{_libexecdir}/proc-version-override

# Install sysctl configuration
install -Dm0644 %{SOURCE22} -t %{buildroot}%{_sysctldir}/

Expand Down Expand Up @@ -435,8 +430,6 @@ install -Dm0644 %{SOURCE22} -t %{buildroot}%{_sysctldir}/
%dir %{_sysconfdir}/swid
%{_sysconfdir}/swid/swidtags.d
%{_prefix}/share/dnf5/libdnf.conf.d/20-azurelinux-defaults.conf
%{_unitdir}/proc-version-override.service
%{_libexecdir}/proc-version-override
%{_sysctldir}/70-azurelinux-hardening.conf


Expand Down Expand Up @@ -476,6 +469,9 @@ install -Dm0644 %{SOURCE22} -t %{buildroot}%{_sysctldir}/


%changelog
* Thu Apr 23 2026 Dan Streetman <ddstreet@ieee.org> - 4.0-11
- Revert proc-version-override

* Tue Apr 21 2026 Dan Streetman <ddstreet@ieee.org> - 4.0-10
- Fix distcore macro definition

Expand Down
15 changes: 0 additions & 15 deletions base/comps/azurelinux-release/proc-version-override.service

This file was deleted.

43 changes: 0 additions & 43 deletions base/comps/azurelinux-release/proc-version-override.sh

This file was deleted.

Loading