diff --git a/anaconda.spec b/anaconda.spec index 851a9b957c4674b0142aa62844c718078206726a..30ea365d382dca75aa99145b008d735f137ccc40 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 36.16.5 -Release: 44 +Release: 45 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -72,6 +72,8 @@ Patch9027: disable-disk-encryption.patch Patch9028: bugfix-set-metacity-with-LIBGL_KOPPER_DISABLE-as-yes.patch Patch9029: bugfix-Fix-abnormal-display-of-network-configuration-interface.patch +Patch9030: backport-Fix-wrong-dracut-timeout-message.patch + %define dasbusver 1.3 %define dbusver 1.2.3 %define dnfver 3.6.0 @@ -327,7 +329,13 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog -* Wed Dec 2024 sunhai - 36.16.5-44 +* Thu Jan 16 2025 sunhai - 36.16.5-45 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: Fix wrong dracut timeout message + +* Wed Dec 05 2024 sunhai - 36.16.5-44 - Type:bugfix - ID:NA - SUG:NA diff --git a/backport-Fix-wrong-dracut-timeout-message.patch b/backport-Fix-wrong-dracut-timeout-message.patch new file mode 100644 index 0000000000000000000000000000000000000000..1d39bc0ee86bb05326c274fba4d3b12c7b17c752 --- /dev/null +++ b/backport-Fix-wrong-dracut-timeout-message.patch @@ -0,0 +1,42 @@ +From 87780c8ba530f10cc4e489c387fc34084f98afee Mon Sep 17 00:00:00 2001 +From: Jiri Konecny +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.23.0 \ No newline at end of file