diff --git a/.gitignore b/.gitignore index 0dd4d92..836075c 100644 --- a/.gitignore +++ b/.gitignore @@ -278,3 +278,4 @@ /anaconda-34.24.3.tar.bz2 /anaconda-34.24.4.tar.bz2 /anaconda-34.24.5.tar.bz2 +/anaconda-34.24.6.tar.bz2 diff --git a/0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch b/0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch deleted file mode 100644 index 5e81a52..0000000 --- a/0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 79fa095319696a9e91ab35cc694cdf9919a3428f Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 22 Feb 2021 19:25:01 +0100 -Subject: [PATCH] Determine GRUB directory relative path to use in config file - -Currently Anaconda is only checking whether /boot/ is a mount point or not -to use the proper relative path to the GRUB directory. But there are more -cases than this, for example /boot/grub2 could be a symlink or a subvolume -in a btrfs filesystem. - -Use the grub2-mkrelpath tool to figure out the actual relative path that -has to be used in the GRUB config file. - -Resolves: rhbz#1928588 - -Signed-off-by: Javier Martinez Canillas ---- - pyanaconda/modules/storage/bootloader/efi.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py -index 8c08b8c68d..425cb31954 100644 ---- a/pyanaconda/modules/storage/bootloader/efi.py -+++ b/pyanaconda/modules/storage/bootloader/efi.py -@@ -173,10 +173,11 @@ class EFIGRUB(EFIBase, GRUB2): - with open(config_path, "w") as fd: - grub_dir = self.config_dir - fs_uuid = self.stage2_device.format.uuid -- mountpoint = self.stage2_device.format.mountpoint - -- if mountpoint != "/" and grub_dir.startswith(mountpoint): -- grub_dir = grub_dir[len(mountpoint):] -+ grub_dir = util.execWithCapture("grub2-mkrelpath", [grub_dir], -+ root=conf.target.system_root) -+ if not grub_dir: -+ raise BootLoaderError("Could not get GRUB directory path") - - fd.write("search --no-floppy --fs-uuid --set=dev %s\n" % fs_uuid) - fd.write("set prefix=($dev)%s\n" % grub_dir) --- -2.26.2 - diff --git a/0005-The-network-spoke-should-be-visible-in-live-spins-19.patch b/0005-The-network-spoke-should-be-visible-in-live-spins-19.patch deleted file mode 100644 index 4a41fbe..0000000 --- a/0005-The-network-spoke-should-be-visible-in-live-spins-19.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 89fb55d22f64eda26d18c735dfd59ee99b5191c2 Mon Sep 17 00:00:00 2001 -From: Vendula Poncova -Date: Tue, 23 Feb 2021 15:50:50 +0100 -Subject: [PATCH] The network spoke should be visible in live spins (#1932961) - -It should be always possible to configure the hostname for the target system -in the graphical network spoke, unless the spoke was specifically disabled in -the Anaconda configuration files. - -This regression was caused by the commit 6b80b7b. - -Resolves: rhbz#1932961 ---- - pyanaconda/ui/gui/spokes/network.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py -index 1ef468a084..3cae5b4489 100644 ---- a/pyanaconda/ui/gui/spokes/network.py -+++ b/pyanaconda/ui/gui/spokes/network.py -@@ -1472,7 +1472,8 @@ class NetworkSpoke(FirstbootSpokeMixIn, NormalSpoke): - if not FirstbootSpokeMixIn.should_run(environment, data): - return False - -- return conf.system.can_configure_network -+ # Always allow to configure the hostname for the target system. -+ return True - - def __init__(self, *args, **kwargs): - NormalSpoke.__init__(self, *args, **kwargs) --- -2.26.2 - diff --git a/0006-Choose-the-best-locale-more-carefully-1933384.patch b/0006-Choose-the-best-locale-more-carefully-1933384.patch deleted file mode 100644 index 2adf547..0000000 --- a/0006-Choose-the-best-locale-more-carefully-1933384.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 00bd48ce9a7ac00e6b47610a9477b43016acd080 Mon Sep 17 00:00:00 2001 -From: Vendula Poncova -Date: Mon, 1 Mar 2021 11:54:34 +0100 -Subject: [PATCH] Choose the best locale more carefully (#1933384) - -Use the default locale if there are no locales to choose from. - -Resolves: rhbz#1933384 ---- - pyanaconda/ui/gui/spokes/welcome.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/pyanaconda/ui/gui/spokes/welcome.py b/pyanaconda/ui/gui/spokes/welcome.py -index fb49188c1..0e17d8106 100644 ---- a/pyanaconda/ui/gui/spokes/welcome.py -+++ b/pyanaconda/ui/gui/spokes/welcome.py -@@ -228,7 +228,8 @@ class WelcomeLanguageSpoke(StandaloneSpoke, LangLocaleHandler): - store.set(commonLangsItr, 0, "", 1, "", 2, "", 3, True) - - # setup the "best" locale -- locale = localization.setup_locale(locales[0], self._l12_module) -+ best_locale = locales[0] if locales else DEFAULT_LANG -+ locale = localization.setup_locale(best_locale, self._l12_module) - self._set_lang(locale) - self._select_locale(self._l12_module.Language) - --- -2.26.2 - diff --git a/0007-Use-the-volume-UUID-to-search-for-the-GRUB-config-in.patch b/0007-Use-the-volume-UUID-to-search-for-the-GRUB-config-in.patch deleted file mode 100644 index 971372d..0000000 --- a/0007-Use-the-volume-UUID-to-search-for-the-GRUB-config-in.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2efdec8ba54caff05548d8711db6a3f9523b157d Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas -Date: Mon, 8 Mar 2021 17:42:15 +0100 -Subject: [PATCH] Use the volume UUID to search for the GRUB config in btrfs - partitions - -For UEFI installs, a minimal GRUB config file is created in the EFI System -Partition that is used to load the main config file that is located in the -/boot/grub2 directory. The partition that contains the latter, is found by -the minimal config searching a device with a given filesystem UUID. - -But for this to work the stage2 device must have a filesystem UUID set and -blivet doesn't set this for partitions formatted with a btrfs filesystem. - -Because each btrfs volume will have its own UUID, the UUID of the volume -that's mounted according to /etc/fstab must be used to search the device. - -Resolves: rhbz#1930567 - -Signed-off-by: Javier Martinez Canillas ---- - pyanaconda/modules/storage/bootloader/efi.py | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/pyanaconda/modules/storage/bootloader/efi.py b/pyanaconda/modules/storage/bootloader/efi.py -index 425cb31954..82f60e4c40 100644 ---- a/pyanaconda/modules/storage/bootloader/efi.py -+++ b/pyanaconda/modules/storage/bootloader/efi.py -@@ -172,7 +172,13 @@ class EFIGRUB(EFIBase, GRUB2): - - with open(config_path, "w") as fd: - grub_dir = self.config_dir -- fs_uuid = self.stage2_device.format.uuid -+ if self.stage2_device.format.type != "btrfs": -+ fs_uuid = self.stage2_device.format.uuid -+ else: -+ fs_uuid = self.stage2_device.format.vol_uuid -+ -+ if fs_uuid is None: -+ raise BootLoaderError("Could not get stage2 filesystem UUID") - - grub_dir = util.execWithCapture("grub2-mkrelpath", [grub_dir], - root=conf.target.system_root) --- -2.26.2 - diff --git a/3230.patch b/3230.patch deleted file mode 100644 index 9404230..0000000 --- a/3230.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2fda26c1ec30da3b5fb8bdc4bbe6720d7870b2ec Mon Sep 17 00:00:00 2001 -From: Radek Vykydal -Date: Tue, 9 Mar 2021 17:51:00 +0100 -Subject: [PATCH] Do not follow symlinks when copying /etc/resolv.conf - (#1933454) - ---- - pyanaconda/modules/network/installation.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pyanaconda/modules/network/installation.py b/pyanaconda/modules/network/installation.py -index ed61ae961b..0d87101b93 100644 ---- a/pyanaconda/modules/network/installation.py -+++ b/pyanaconda/modules/network/installation.py -@@ -225,9 +225,9 @@ def _copy_resolv_conf(self, root, overwrite): - :param overwrite: overwrite existing configuration file - :type overwrite: bool - """ -- self._copy_file_to_root(root, self.RESOLV_CONF_FILE_PATH) -+ self._copy_file_to_root(root, self.RESOLV_CONF_FILE_PATH, follow_symlinks=False) - -- def _copy_file_to_root(self, root, config_file, overwrite=False): -+ def _copy_file_to_root(self, root, config_file, overwrite=False, follow_symlinks=True): - """Copy the file to target system. - - :param root: path to the root of the target system -@@ -244,7 +244,7 @@ def _copy_file_to_root(self, root, config_file, overwrite=False): - return - if not os.path.isdir(os.path.dirname(fpath)): - util.mkdirChain(os.path.dirname(fpath)) -- shutil.copy(config_file, fpath) -+ shutil.copy(config_file, fpath, follow_symlinks=follow_symlinks) - - def _copy_device_config_files(self, root): - """Copy network device config files to target system. diff --git a/anaconda.spec b/anaconda.spec index 7ca5d18..23672b7 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda -Version: 34.24.5 -Release: 5%{?dist} +Version: 34.24.6 +Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -23,18 +23,6 @@ Patch1: 0002-Revert-Do-not-support-no-inst.-Anaconda-boot-args-in.patch Patch2: 0003-Do-not-require-inst.-prefixes-for-Anaconda-boot-argu.patch %endif -Patch3: 0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch -Patch4: 0005-The-network-spoke-should-be-visible-in-live-spins-19.patch -Patch5: 0006-Choose-the-best-locale-more-carefully-1933384.patch - -# Proposed fix for https://bugzilla.redhat.com/show_bug.cgi?id=1933454 -# https://github.com/rhinstaller/anaconda/pull/3230 -Patch6: 3230.patch - -# FE fix for a BTRFS GRUB issue -# https://bugzilla.redhat.com/show_bug.cgi?id=1930567 -Patch7: 0007-Use-the-volume-UUID-to-search-for-the-GRUB-config-in.patch - # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -126,7 +114,6 @@ Requires: python3-productmd Requires: python3-dasbus >= %{dasbusver} Requires: flatpak-libs %if 0%{?rhel} -Requires: python3-syspurpose Requires: subscription-manager >= %{subscriptionmanagerver} %endif @@ -435,18 +422,25 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog -* Wed Mar 10 2021 Martin Kolman - 34.24.5-5 -- Use the volume UUID to search for the GRUB config in btrfs partitions (#1930567) (vponcova) - -* Tue Mar 09 2021 Adam Williamson - 34.24.5-4 -- Backport #3230 to try and fix #1933454 - -* Tue Mar 02 2021 Martin Kolman - 34.24.5-3 +* Mon Mar 22 2021 Martin Kolman - 34.24.6-1 +- Check if the mount point exists before calling statvfs (#1824357) (vponcova) +- Do not follow symlinks when copying /etc/resolv.conf (#1933454) (rvykydal) +- Use the volume UUID to search for the GRUB config in btrfs partitions + (javierm) +- Drop python3-syspurpose dependency (mkolman) +- Fix copypaste typo in github owner tests (vslavik) +- Modify owner tests for this f34-release branch (vslavik) +- Fix running tests for the f34-devel branch (vslavik) +- Wrap text in spoke title labels, if needed (vslavik) +- Wrap welcome spoke title if needed (vslavik) - Choose the best locale more carefully (#1933384) (vponcova) - -* Thu Feb 25 2021 Martin Kolman - 34.24.5-2 -- Determine GRUB directory relative path to use in config file (#1928588) (javierm) +- Make the user interface context safe for the initial setup (vponcova) - The network spoke should be visible in live spins (#1932961) (vponcova) +- Ignore Pylint errors on DNF API (vslavik) +- Ignore Pylint errors for PropertiesChanged.connect (vslavik) +- Silence false Pylint warning (vslavik) +- Ignore false Pylint errors for Enum subclasses (vslavik) +- Determine GRUB directory relative path to use in config file (javierm) * Mon Feb 22 2021 Martin Kolman - 34.24.5-1 - Add the "Encrypt my data" checkbox to the custom partitioning spoke diff --git a/sources b/sources index 5826262..0c1c7b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-34.24.5.tar.bz2) = 8356e3352a99b0a604189564e73496342f1e015d772a926606539ea64a45a724ec34ca95234db6cee8f268c702dcfd5d7dcaccfaf289e847ae3acc932be8662d +SHA512 (anaconda-34.24.6.tar.bz2) = 5e41b0e2b22ac15c54684c1d28519a70029484890d9b49d46e21a117dcec49935209a57acf4c6886d87411870a25a7571aff627914e91210cfd45d4d06dac287