packages/anaconda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wrong dracut timeout message

Browse Source
This commit is contained in:
sun_hai_10 2025-01-16 10:53:02 +08:00
parent 5753245537
commit ff41085267
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
anaconda.spec
View File

@ -1,7 +1,7 @@
%define _empty_manifest_terminate_build 0 %define _empty_manifest_terminate_build 0
Name: anaconda Name: anaconda
Version: 36.16.5 Version: 36.16.5
Release: 45 Release: 46
Summary: Graphical system installer Summary: Graphical system installer
License: GPLv2+ and MIT License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda URL: http://fedoraproject.org/wiki/Anaconda
@ -73,6 +73,8 @@ Patch9028: bugfix-set-metacity-with-LIBGL_KOPPER_DISABLE-as-yes.patch
Patch9029: bugfix-Fix-abnormal-display-of-network-configuration-interface.patch Patch9029: bugfix-Fix-abnormal-display-of-network-configuration-interface.patch
Patch9030: bugfix-fix-duplicate-alt-D-accelerator-on-root-account-screen.patch Patch9030: bugfix-fix-duplicate-alt-D-accelerator-on-root-account-screen.patch
Patch9031: backport-Fix-wrong-dracut-timeout-message.patch
%define dasbusver 1.3 %define dasbusver 1.3
%define dbusver 1.2.3 %define dbusver 1.2.3
%define dnfver 3.6.0 %define dnfver 3.6.0
@ -328,13 +330,19 @@ update-desktop-database &> /dev/null || :
%{_prefix}/libexec/anaconda/dd_* %{_prefix}/libexec/anaconda/dd_*
%changelog %changelog
* Thu Jan 16 2025 sunhai <sunhai10@huawei.com> - 36.16.5-46
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: Fix wrong dracut timeout message
* Thu Dec 05 2024 majianhan <majianhan@kylinos.cn> - 36.16.5-45 * Thu Dec 05 2024 majianhan <majianhan@kylinos.cn> - 36.16.5-45
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA
- SUG:NA - SUG:NA
- DESC: Fix duplicate alt-D accelerator on root account screen - DESC: Fix duplicate alt-D accelerator on root account screen
* Wed Dec 2024 sunhai <sunhai10@huawei.com> - 36.16.5-44 * Wed Dec 05 2024 sunhai <sunhai10@huawei.com> - 36.16.5-44
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA
- SUG:NA - SUG:NA

44
backport-Fix-wrong-dracut-timeout-message.patch Normal file
View File

@ -0,0 +1,44 @@
From 87780c8ba530f10cc4e489c387fc34084f98afee Mon Sep 17 00:00:00 2001
From: Jiri Konecny <jkonecny@redhat.com>
Date: Fri, 31 Mar 2023 10:20:27 +0200
Subject: [PATCH] Fix wrong dracut timeout message
We added Anaconda error reporting when Dracut timeout during boot. If
the reason is known issue we will print that to a user. However, in case
it is not known the code failed with message:
... /run/anaconda/initrd_errors.txt: No such file or directory
To fix this just print "Reason unknown" and not execute rest of the
code.
Reference:https://github.com/rhinstaller/anaconda/commit/87780c8ba530f10cc4e489c387fc34084f98afee
Conflict:NA
---
dracut/anaconda-error-reporting.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dracut/anaconda-error-reporting.sh b/dracut/anaconda-error-reporting.sh
index c9cca5cea2e..b410cd667e5 100755
--- a/dracut/anaconda-error-reporting.sh
+++ b/dracut/anaconda-error-reporting.sh
@@ -14,9 +14,13 @@ warn "Please also note that the 'inst.' prefix is now mandatory."
warn "# #"
warn "#### Installer errors encountered during boot: ####"
warn "# #"
-while read -r line; do
- warn "$line"
-done < /run/anaconda/initrd_errors.txt
+if ! [ -e /run/anaconda/initrd_errors.txt ]; then
+ warn "Reason unknown"
+else
+ while read -r line; do
+ warn "$line"
+ done < /run/anaconda/initrd_errors.txt
+fi
warn "# #"
warn "############# Anaconda installer errors end ###############"
--
2.43.0