Revert OL modifications

This commit is contained in:
eabdullin 2025-12-22 07:20:00 +00:00
parent 5e99763a8c
commit e736030742
2 changed files with 1 additions and 60 deletions

View File

@ -1,54 +0,0 @@
From fac38a6c113f89a91e64552937346cdad695ed11 Mon Sep 17 00:00:00 2001
From: Kevin Lyons <kevin.x.lyons@oracle.com>
Date: Fri, 13 Jun 2025 10:03:55 -0700
Subject: [PATCH] Prevent error generating initrd during kernel package
POSTTRANS script
Orabug: 38073419
Signed-off-by: Kevin Lyons <kevin.x.lyons@oracle.com>
Reviewed-by: Alex Burmashev alexander.burmashev@oracle.com
---
.../dracut/51coreos-installer/module-setup.sh | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/coreos-installer-dracut-71817332483aad341ffc666ed69b7869a7a90652/dracut/51coreos-installer/module-setup.sh b/coreos-installer-dracut-71817332483aad341ffc666ed69b7869a7a90652/dracut/51coreos-installer/module-setup.sh
index 6397da3..651d2b9 100755
--- a/coreos-installer-dracut-71817332483aad341ffc666ed69b7869a7a90652/dracut/51coreos-installer/module-setup.sh
+++ b/coreos-installer-dracut-71817332483aad341ffc666ed69b7869a7a90652/dracut/51coreos-installer/module-setup.sh
@@ -45,7 +45,6 @@ install() {
rm \
sed \
sfdisk \
- sgdisk \
find \
gpg-connect-agent \
clevis-luks-unlock
@@ -57,19 +56,19 @@ install() {
"/usr/libexec/coreos-installer-service"
install_and_enable_unit "coreos-installer.service" \
- "default.target"
+ "initrd.target"
install_and_enable_unit "coreos-installer-reboot.service" \
- "default.target"
+ "initrd.target"
install_and_enable_unit "coreos-installer-noreboot.service" \
- "default.target"
+ "initrd.target"
install_and_enable_unit "coreos-installer-poweroff.service" \
- "default.target"
+ "initrd.target"
install_and_enable_unit "coreos-installer-growfs.service" \
- "default.target"
+ "initrd.target"
inst_script "$moddir/coreos-installer-growfs" \
/usr/libexec/coreos-installer-growfs
--
2.43.5

View File

@ -12,7 +12,7 @@
Name: rust-%{crate}
Version: 0.24.0
Release: 5.0.1%{?dist}
Release: 5%{?dist}
Summary: Installer for Fedora CoreOS and RHEL CoreOS
# Upstream license specification: Apache-2.0
@ -22,7 +22,6 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
# not used on Fedora
Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz
Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{dracutcommit}/coreos-installer-dracut-%{dracutshortcommit}.tar.gz
Patch100: bug38073419-Prevent-error-generating-initrd-during-kernel-packag.patch
# https://github.com/coreos/coreos-installer/pull/1654
Patch0: 0001-download-format-byte-unit-with-1-decimal-place-preci.patch
@ -184,10 +183,6 @@ from the initramfs.
%endif
%changelog
* Thu Dec 18 2025 EL Errata <el-errata_ww@oracle.com> - 0.24.0-5.0.1
- Prevent error generating initrd during kernel package POSTTRANS script
[Orabug: 38073419]
* Wed Nov 19 2025 Huijing Hei <hhei@redhat.com> - 0.24.0-5
- rootmap: Inject `mpath.wwid=$WWID` when on multipath
Backport https://github.com/coreos/coreos-installer/pull/1676/commits/a40af0a3ec13c4fd49b34317e80f6c0bc845b46a