Skip to content

feat(grubby): provide the /etc/sysconfig/kernel file #17532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ddstreet wants to merge 1 commit into from
+48 −3
Closed

feat(grubby): provide the /etc/sysconfig/kernel file #17532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion base/comps/components.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
[components.grep]
[components.groff]
[components.grpc]
[components.grubby]
[components.gsettings-desktop-schemas]
[components.gsl]
[components.gsm]
Expand Down
30 changes: 30 additions & 0 deletions base/comps/grubby/grubby.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[components.grubby]

[[components.grubby.overlays]]
description = "Provide /etc/sysconfig/kernel file"
type = "file-add"
file = "kernel.sysconfig"
source = "kernel.sysconfig"

[[components.grubby.overlays]]
description = "Provide /etc/sysconfig/kernel file"
type = "spec-add-tag"
tag = "Source999"
value = "kernel.sysconfig"

[[components.grubby.overlays]]
description = "Provide /etc/sysconfig/kernel file"
type = "spec-append-lines"
Comment thread
ddstreet marked this conversation as resolved.
section = "%install"
lines = [
"mkdir -p %{buildroot}%{_sysconfdir}/sysconfig",
"install -m 0644 %{SOURCE999} %{buildroot}%{_sysconfdir}/sysconfig/kernel",
]

[[components.grubby.overlays]]
description = "Provide /etc/sysconfig/kernel file"
type = "spec-append-lines"
Comment thread
ddstreet marked this conversation as resolved.
section = "%files"
lines = [
"%config(noreplace) %{_sysconfdir}/sysconfig/kernel",
]
Comment thread
ddstreet marked this conversation as resolved.
6 changes: 6 additions & 0 deletions base/comps/grubby/kernel.sysconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# UPDATEDEFAULT specifies if kernel-install should make
# new kernels the default
UPDATEDEFAULT=yes

# DEFAULTKERNEL specifies the default kernel package type
DEFAULTKERNEL=kernel-core
Comment thread
ddstreet marked this conversation as resolved.
2 changes: 1 addition & 1 deletion locks/grubby.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '6095bc576b3aa216400f1cc133ade107d4830ea7'
upstream-commit = '6095bc576b3aa216400f1cc133ade107d4830ea7'
input-fingerprint = 'sha256:b671086c622372cdbe19f56c5b93a8cf2e9c9011cda4ef5ca095be17b87fd3d1'
input-fingerprint = 'sha256:4e4d6eadfa7a610b2590ae529250234d165b48bfbaa2ad7d4d1d2627a82b78f6'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
6 changes: 5 additions & 1 deletion specs/g/grubby/grubby.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Name: grubby
Version: 8.40
Release: 86%{?dist}
Release: 87%{?dist}
Summary: Command line tool for updating bootloader configs
License: GPL-2.0-or-later
Source1: grubby-bls
Expand Down Expand Up @@ -40,6 +40,7 @@ Conflicts: uboot-tools < 2021.01-0.1.rc2
Obsoletes: %{name}-bls < %{version}-%{release}
Obsoletes: %{name}-deprecated < %{version}-%{release}

Source999: kernel.sysconfig
%description
This package provides a grubby compatibility script that manages
BootLoaderSpec files and is meant to be backward compatible with
Expand All @@ -62,6 +63,8 @@ install -D -m 0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE6}
mkdir -p %{buildroot}%{_mandir}/man8
install -m 0644 %{SOURCE7} %{buildroot}%{_mandir}/man8/

mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
install -m 0644 %{SOURCE999} %{buildroot}%{_sysconfdir}/sysconfig/kernel
%post
if [ "$1" = 2 ]; then
arch=$(uname -m)
Expand All @@ -76,6 +79,7 @@ fi
%attr(0755,root,root) %{_prefix}/lib/kernel/install.d/95-kernel-hooks.install
%{_mandir}/man8/grubby.8*

%config(noreplace) %{_sysconfdir}/sysconfig/kernel
%changelog
* Wed Jul 30 2025 Leo Sandoval <lsandova@redhat.com> - 8.40-85
- Update cfg when setting a default kernel
Expand Down
6 changes: 6 additions & 0 deletions specs/g/grubby/kernel.sysconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# UPDATEDEFAULT specifies if kernel-install should make
# new kernels the default
UPDATEDEFAULT=yes

# DEFAULTKERNEL specifies the default kernel package type
DEFAULTKERNEL=kernel-core
Loading