diff --git a/anaconda.spec b/anaconda.spec index d8694376ceaa22283dd8113edf7164d53e26ce31..6c6bb8572512e76fb16e99d20f329e88cbbe5eff 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 33.19 -Release: 44 +Release: 45 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -365,6 +365,12 @@ update-desktop-database &> /dev/null || : %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Aug 8 2022 wanglu - 33.19-45 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix a mistake about revert "Set default entry to the BLS id instead of the entry index" + * Thu Aug 4 2022 wanglu - 33.19-44 - Type:bugfix - CVE:NA diff --git a/backport-revert-Set-default-entry-to-the-BLS-id-instead-of-th.patch b/backport-revert-Set-default-entry-to-the-BLS-id-instead-of-th.patch index 54bbd8d2f550f24594407c2180b16b833d4443f6..4a3afe96c50e27c977d6d0101204e990ea358153 100644 --- a/backport-revert-Set-default-entry-to-the-BLS-id-instead-of-th.patch +++ b/backport-revert-Set-default-entry-to-the-BLS-id-instead-of-th.patch @@ -29,16 +29,16 @@ index 3209ab7..6a6441b 100644 - - default_entry = "%s-%s" % (machine_id, self.default.version) - rc = util.execInSysroot("grub2-set-default", [default_entry]) -+ #find the index of the default image ++ # find the index of the default image + try: + default_index = self.images.index(self.default) -+ except VauleError: ++ except ValueError: + # pylint: disable=no-member + log.warning("Failed to find default image (%s), defaulting to 0", + self.default.label) + default_index = 0 + -+ rc = util.exeInSysroot("grub2-set-default", [str(default_index)]) ++ rc = util.execInSysroot("grub2-set-default", [str(default_index)]) if rc: log.error("failed to set default menu entry to %s", productName)