From 7cff7707ddb61e2bd85c2db3bad8c8668bcad300 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Thu, 11 Feb 2021 18:52:22 +0100 Subject: [PATCH 01/13] New version 34.24.1-1 - Adjust configuration options for Fedora 34 (mkolman) - Add dependabot support for GitHub actions (jkonecny) - Set volume id for iso built for kickstart test (rvykydal) - Guess the default product name from the os-release files (vponcova) - Apply overrides for the anaconda widgets only in the test environment (vponcova) - Create real updates images (vponcova) - Remove deprecated support for add-ons (vponcova) - Don't run installation tasks of add-ons in a meta task (vponcova) - network: wrap IP addresses showed in GUI for wireless devices (#1925781) (rvykydal) - Install support for non-ascii keyboard layouts (#1919483) (vponcova) --- .gitignore | 1 + anaconda.spec | 16 +++++++++++++++- sources | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dc80215..30bd181 100644 --- a/.gitignore +++ b/.gitignore @@ -273,3 +273,4 @@ /anaconda-34.22.tar.bz2 /anaconda-34.23.tar.bz2 /anaconda-34.24.tar.bz2 +/anaconda-34.24.1.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 473a89d..54e5704 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 34.24 +Version: 34.24.1 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -420,6 +420,20 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Thu Feb 11 2021 Martin Kolman - 34.24.1-1 +- Adjust configuration options for Fedora 34 (mkolman) +- Add dependabot support for GitHub actions (jkonecny) +- Set volume id for iso built for kickstart test (rvykydal) +- Guess the default product name from the os-release files (vponcova) +- Apply overrides for the anaconda widgets only in the test environment + (vponcova) +- Create real updates images (vponcova) +- Remove deprecated support for add-ons (vponcova) +- Don't run installation tasks of add-ons in a meta task (vponcova) +- network: wrap IP addresses showed in GUI for wireless devices (#1925781) + (rvykydal) +- Install support for non-ascii keyboard layouts (#1919483) (vponcova) + * Mon Feb 08 2021 Martin Kolman - 34.24-1 - Modify spec file to add patches required on rhel-9 rebuild (#1907566) (jkonecny) diff --git a/sources b/sources index 24ae731..f87c267 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-34.24.tar.bz2) = 5a5b240debf0b45ab7471ad8639bc634741582fd4e86fd8cea8ff516ee9cf90fe35f0193c2383306ad68125569d80a7968017092b36979f240026b15eddf2276 +SHA512 (anaconda-34.24.1.tar.bz2) = 023eec762b78a210413666ece71d417589f74f605590e07a762fc524f919ca5a65e10f8dbf8911110c3c7e7f631ce927bc3d827929b238ed81b79f461ece1b7a From 46010b50baad9f4f7134ef3a0b27d5eb9a63f972 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Fri, 12 Feb 2021 15:40:41 +0100 Subject: [PATCH 02/13] New version 34.24.2-1 - Rename pyanaconda.modules.common.typing (vponcova) --- .gitignore | 1 + anaconda.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 30bd181..cdd31bc 100644 --- a/.gitignore +++ b/.gitignore @@ -274,3 +274,4 @@ /anaconda-34.23.tar.bz2 /anaconda-34.24.tar.bz2 /anaconda-34.24.1.tar.bz2 +/anaconda-34.24.2.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 54e5704..c89fe57 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 34.24.1 +Version: 34.24.2 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -420,6 +420,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Fri Feb 12 2021 Martin Kolman - 34.24.2-1 +- Rename pyanaconda.modules.common.typing (vponcova) + * Thu Feb 11 2021 Martin Kolman - 34.24.1-1 - Adjust configuration options for Fedora 34 (mkolman) - Add dependabot support for GitHub actions (jkonecny) diff --git a/sources b/sources index f87c267..fa70883 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-34.24.1.tar.bz2) = 023eec762b78a210413666ece71d417589f74f605590e07a762fc524f919ca5a65e10f8dbf8911110c3c7e7f631ce927bc3d827929b238ed81b79f461ece1b7a +SHA512 (anaconda-34.24.2.tar.bz2) = e6016980cdcf78023775216f6417d1beee69667b4a48b8c0d3b02f9f63f4d51000150e5f57841c0ca8bcb9897e1901c807f5a9a2413ac681e733467a96f42ccc From ce17ff4e5fde4fb009310fde45a555d3e31e0308 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 15 Feb 2021 18:57:45 +0100 Subject: [PATCH 03/13] New version 34.24.3-1 - Do not hard-require zram-generator-default on RHEL just yet (mkolman) - Improve Packit configuration to use fedora-development (jkonecny) - Add a kickstart specification for the main process (vponcova) - Adapt Packit configuration to a newly branched Fedora (jkonecny) - Create swap by default in RHEL-based installations (#1915297) (vponcova) - Add missing space to a message (vslavik) - Use Linux HOST_NAME_MAX hostname length limit (xiaqirong1) --- .gitignore | 1 + anaconda.spec | 14 +++++++++++++- sources | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cdd31bc..e5aad74 100644 --- a/.gitignore +++ b/.gitignore @@ -275,3 +275,4 @@ /anaconda-34.24.tar.bz2 /anaconda-34.24.1.tar.bz2 /anaconda-34.24.2.tar.bz2 +/anaconda-34.24.3.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index c89fe57..4bcbce7 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 34.24.2 +Version: 34.24.3 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -237,7 +237,10 @@ Requires: gdb Requires: rsync # only WeakRequires elsewhere and not guaranteed to be present Requires: device-mapper-multipath +# FIXME: do not require on RHEL until the package is ready +%if ! 0%{?rhel} == 9 Requires: zram-generator-defaults +%endif %description install-img-deps The anaconda-install-img-deps metapackage lists all boot.iso installation image dependencies. @@ -420,6 +423,15 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Feb 15 2021 Martin Kolman - 34.24.3-1 +- Do not hard-require zram-generator-default on RHEL just yet (mkolman) +- Improve Packit configuration to use fedora-development (jkonecny) +- Add a kickstart specification for the main process (vponcova) +- Adapt Packit configuration to a newly branched Fedora (jkonecny) +- Create swap by default in RHEL-based installations (#1915297) (vponcova) +- Add missing space to a message (vslavik) +- Use Linux HOST_NAME_MAX hostname length limit (xiaqirong1) + * Fri Feb 12 2021 Martin Kolman - 34.24.2-1 - Rename pyanaconda.modules.common.typing (vponcova) diff --git a/sources b/sources index fa70883..62148da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-34.24.2.tar.bz2) = e6016980cdcf78023775216f6417d1beee69667b4a48b8c0d3b02f9f63f4d51000150e5f57841c0ca8bcb9897e1901c807f5a9a2413ac681e733467a96f42ccc +SHA512 (anaconda-34.24.3.tar.bz2) = c5c121aa094ca0126e4e6c38924873d372def04a2c064b150d1eb3767be099448ec9e5d2de81c714c25ac932b17b5c864462a4f33cc438373bcf775957f5cf5e From 16fd7bf7584b54455cec4a0835877be4c8ad34a8 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Thu, 18 Feb 2021 16:16:20 +0100 Subject: [PATCH 04/13] New version 34.24.4-1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - [Storage] add btrfs_compression option (#1928857) (michel) - Correct branch config after merge (vslavik) - Enable Makefiles and Dockerfiles for branched Fedora (vslavik) - packit: make tests ⊂ builds for the chroot set (ttomecek) - packit: run all actions in a single action (ttomecek) - configure.ac: make the Copyright up to date (ttomecek) - ovirt: rebase on CentOS Stream (sbonazzo) - Use a custom stylesheet to define RHEL-specific stylesheet data (vponcova) - Remove unused variables from Makefile (vslavik) - Drop astroid hotfix patch (jkonecny) - Don't block the start of the Network module by the hostname service (vponcova) - Remove unused variables related to mock (vslavik) - Save lorax-packages.log to installed system (rvykydal) --- .gitignore | 1 + anaconda.spec | 20 ++++++++++++++++++-- sources | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e5aad74..34a68db 100644 --- a/.gitignore +++ b/.gitignore @@ -276,3 +276,4 @@ /anaconda-34.24.1.tar.bz2 /anaconda-34.24.2.tar.bz2 /anaconda-34.24.3.tar.bz2 +/anaconda-34.24.4.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 4bcbce7..1854466 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 34.24.3 +Version: 34.24.4 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -48,7 +48,7 @@ Patch2: 0003-Do-not-require-inst.-prefixes-for-Anaconda-boot-argu.patch %define nmver 1.0 %define pykickstartver 3.32-1 %define pypartedver 2.5-2 -%define pythonblivetver 1:3.2.2-1 +%define pythonblivetver 1:3.3.3-1 %define rpmver 4.10.0 %define simplelinever 1.1-1 %define subscriptionmanagerver 1.26 @@ -423,6 +423,22 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Thu Feb 18 2021 Martin Kolman - 34.24.4-1 +- [Storage] add btrfs_compression option (#1928857) (michel) +- Correct branch config after merge (vslavik) +- Enable Makefiles and Dockerfiles for branched Fedora (vslavik) +- packit: make tests ⊂ builds for the chroot set (ttomecek) +- packit: run all actions in a single action (ttomecek) +- configure.ac: make the Copyright up to date (ttomecek) +- ovirt: rebase on CentOS Stream (sbonazzo) +- Use a custom stylesheet to define RHEL-specific stylesheet data (vponcova) +- Remove unused variables from Makefile (vslavik) +- Drop astroid hotfix patch (jkonecny) +- Don't block the start of the Network module by the hostname service + (vponcova) +- Remove unused variables related to mock (vslavik) +- Save lorax-packages.log to installed system (rvykydal) + * Mon Feb 15 2021 Martin Kolman - 34.24.3-1 - Do not hard-require zram-generator-default on RHEL just yet (mkolman) - Improve Packit configuration to use fedora-development (jkonecny) diff --git a/sources b/sources index 62148da..cfa3736 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-34.24.3.tar.bz2) = c5c121aa094ca0126e4e6c38924873d372def04a2c064b150d1eb3767be099448ec9e5d2de81c714c25ac932b17b5c864462a4f33cc438373bcf775957f5cf5e +SHA512 (anaconda-34.24.4.tar.bz2) = 0c5c117ee54559e323eef18c27593560a625171c7363cfe4bfb84c917fdbf3a67d0e995c85839f35f61c812d39ab9fea0b35d4cb5f4c8212be7cc19e5b723ca0 From 6f9ad3844c7b9fb7358886e71f634a682963e8fa Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 22 Feb 2021 19:09:34 +0100 Subject: [PATCH 05/13] New version 34.24.5-1 - Add the "Encrypt my data" checkbox to the custom partitioning spoke (vponcova) - Don't translate prompt keys (#1892830) (vponcova) - Fix RHEL zram conditional in spec file (mkolman) - Remove interactive parameter from container-rpm-test (jkonecny) - Add container push for rpm containers (jkonecny) - Enable our and blivet COPR repositories for rpm tests (jkonecny) - vconsole font selection to cover more langs (suanand) --- .gitignore | 1 + anaconda.spec | 14 ++++++++++++-- sources | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 34a68db..0dd4d92 100644 --- a/.gitignore +++ b/.gitignore @@ -277,3 +277,4 @@ /anaconda-34.24.2.tar.bz2 /anaconda-34.24.3.tar.bz2 /anaconda-34.24.4.tar.bz2 +/anaconda-34.24.5.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 1854466..6c029d0 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 34.24.4 +Version: 34.24.5 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -238,7 +238,7 @@ Requires: rsync # only WeakRequires elsewhere and not guaranteed to be present Requires: device-mapper-multipath # FIXME: do not require on RHEL until the package is ready -%if ! 0%{?rhel} == 9 +%if 0%{?rhel} != 9 Requires: zram-generator-defaults %endif @@ -423,6 +423,16 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Feb 22 2021 Martin Kolman - 34.24.5-1 +- Add the "Encrypt my data" checkbox to the custom partitioning spoke + (vponcova) +- Don't translate prompt keys (#1892830) (vponcova) +- Fix RHEL zram conditional in spec file (mkolman) +- Remove interactive parameter from container-rpm-test (jkonecny) +- Add container push for rpm containers (jkonecny) +- Enable our and blivet COPR repositories for rpm tests (jkonecny) +- vconsole font selection to cover more langs (suanand) + * Thu Feb 18 2021 Martin Kolman - 34.24.4-1 - [Storage] add btrfs_compression option (#1928857) (michel) - Correct branch config after merge (vslavik) diff --git a/sources b/sources index cfa3736..5826262 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-34.24.4.tar.bz2) = 0c5c117ee54559e323eef18c27593560a625171c7363cfe4bfb84c917fdbf3a67d0e995c85839f35f61c812d39ab9fea0b35d4cb5f4c8212be7cc19e5b723ca0 +SHA512 (anaconda-34.24.5.tar.bz2) = 8356e3352a99b0a604189564e73496342f1e015d772a926606539ea64a45a724ec34ca95234db6cee8f268c702dcfd5d7dcaccfaf289e847ae3acc932be8662d From 3c5ba04f65917f04b1954bf4b020c7249c6abdd0 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Thu, 25 Feb 2021 19:04:43 +0100 Subject: [PATCH 06/13] New version 34.24.5-2 - Determine GRUB directory relative path to use in config file (#1928588) (javierm) - The network spoke should be visible in live spins (#1932961) (vponcova) --- ...irectory-relative-path-to-use-in-con.patch | 42 +++++++++++++++++++ ...e-should-be-visible-in-live-spins-19.patch | 33 +++++++++++++++ anaconda.spec | 9 +++- 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch create mode 100644 0005-The-network-spoke-should-be-visible-in-live-spins-19.patch 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 new file mode 100644 index 0000000..5e81a52 --- /dev/null +++ b/0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch @@ -0,0 +1,42 @@ +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 new file mode 100644 index 0000000..4a41fbe --- /dev/null +++ b/0005-The-network-spoke-should-be-visible-in-live-spins-19.patch @@ -0,0 +1,33 @@ +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/anaconda.spec b/anaconda.spec index 6c029d0..31a3f98 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 34.24.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -23,6 +23,9 @@ 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 + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -423,6 +426,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Thu Feb 25 2021 Martin Kolman - 34.24.5-2 +- Determine GRUB directory relative path to use in config file (#1928588) (javierm) +- The network spoke should be visible in live spins (#1932961) (vponcova) + * Mon Feb 22 2021 Martin Kolman - 34.24.5-1 - Add the "Encrypt my data" checkbox to the custom partitioning spoke (vponcova) From 2a73162012beb06e283cbf39f7cca942b6a91c7c Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Tue, 2 Mar 2021 18:54:10 +0100 Subject: [PATCH 07/13] New version 34.24.5-3 - Choose the best locale more carefully (#1933384) (vponcova) --- ...e-best-locale-more-carefully-1933384.patch | 29 +++++++++++++++++++ anaconda.spec | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0006-Choose-the-best-locale-more-carefully-1933384.patch diff --git a/0006-Choose-the-best-locale-more-carefully-1933384.patch b/0006-Choose-the-best-locale-more-carefully-1933384.patch new file mode 100644 index 0000000..2adf547 --- /dev/null +++ b/0006-Choose-the-best-locale-more-carefully-1933384.patch @@ -0,0 +1,29 @@ +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/anaconda.spec b/anaconda.spec index 31a3f98..fea821c 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 34.24.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -25,6 +25,7 @@ Patch2: 0003-Do-not-require-inst.-prefixes-for-Anaconda-boot-argu.patch 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 # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -426,6 +427,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Mar 02 2021 Martin Kolman - 34.24.5-3 +- 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) - The network spoke should be visible in live spins (#1932961) (vponcova) From 5e5e4bc1801f388e0d1db7056a0ad8c8ff04bf50 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 9 Mar 2021 18:11:08 -0800 Subject: [PATCH 08/13] Backport #3230 to try and fix #1933454 --- 3230.patch | 35 +++++++++++++++++++++++++++++++++++ anaconda.spec | 9 ++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 3230.patch diff --git a/3230.patch b/3230.patch new file mode 100644 index 0000000..9404230 --- /dev/null +++ b/3230.patch @@ -0,0 +1,35 @@ +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 fea821c..129b042 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 34.24.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -27,6 +27,10 @@ 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 + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -427,6 +431,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* 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 - Choose the best locale more carefully (#1933384) (vponcova) From 6ec5acaa05fcee83d115e606f4e9333aa52cbf41 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Wed, 10 Mar 2021 18:58:26 +0100 Subject: [PATCH 09/13] New version 34.24.5-5 - Use the volume UUID to search for the GRUB config in btrfs partitions (#1930567) (vponcova) --- ...UID-to-search-for-the-GRUB-config-in.patch | 46 +++++++++++++++++++ anaconda.spec | 9 +++- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 0007-Use-the-volume-UUID-to-search-for-the-GRUB-config-in.patch 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 new file mode 100644 index 0000000..971372d --- /dev/null +++ b/0007-Use-the-volume-UUID-to-search-for-the-GRUB-config-in.patch @@ -0,0 +1,46 @@ +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/anaconda.spec b/anaconda.spec index 129b042..7ca5d18 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 34.24.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -31,6 +31,10 @@ Patch5: 0006-Choose-the-best-locale-more-carefully-1933384.patch # 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). @@ -431,6 +435,9 @@ 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 From 0d97b8208d62383964c332e7a9140a8453216be3 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 22 Mar 2021 18:39:24 +0100 Subject: [PATCH 10/13] New version 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) - 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) --- .gitignore | 1 + ...irectory-relative-path-to-use-in-con.patch | 42 ----------------- ...e-should-be-visible-in-live-spins-19.patch | 33 ------------- ...e-best-locale-more-carefully-1933384.patch | 29 ------------ ...UID-to-search-for-the-GRUB-config-in.patch | 46 ------------------- 3230.patch | 35 -------------- anaconda.spec | 44 ++++++++---------- sources | 2 +- 8 files changed, 21 insertions(+), 211 deletions(-) delete mode 100644 0004-Determine-GRUB-directory-relative-path-to-use-in-con.patch delete mode 100644 0005-The-network-spoke-should-be-visible-in-live-spins-19.patch delete mode 100644 0006-Choose-the-best-locale-more-carefully-1933384.patch delete mode 100644 0007-Use-the-volume-UUID-to-search-for-the-GRUB-config-in.patch delete mode 100644 3230.patch 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 From dddb80de12507110d037654e097a312d29baac96 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Tue, 30 Mar 2021 20:09:06 +0200 Subject: [PATCH 11/13] New version 34.24.7-1 - network: match also connections named by MAC created by NM in initramfs (rvykydal) - Create /tmp with the right permissions (#1937626) (vponcova) - Don't recommend zram-generator-defaults (#1938132) (vponcova) - Don't automatically execute the default partitioning (vponcova) - Fix the warning about working NTP servers (#1889180) (vponcova) - Remove implicit dependencies (vponcova) - Don't install anaconda-install-env-deps by default (vponcova) --- .gitignore | 1 + anaconda.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 836075c..a388034 100644 --- a/.gitignore +++ b/.gitignore @@ -279,3 +279,4 @@ /anaconda-34.24.4.tar.bz2 /anaconda-34.24.5.tar.bz2 /anaconda-34.24.6.tar.bz2 +/anaconda-34.24.7.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 23672b7..6e2bb8d 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 34.24.6 +Version: 34.24.7 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -81,10 +81,8 @@ BuildRequires: libtimezonemap-devel >= %{libtimezonemapver} BuildRequires: gdk-pixbuf2-devel BuildRequires: libxml2 -Requires: anaconda-core = %{version}-%{release} Requires: anaconda-gui = %{version}-%{release} Requires: anaconda-tui = %{version}-%{release} -Requires: anaconda-install-env-deps = %{version}-%{release} %description The anaconda package is a metapackage for the Anaconda installer. @@ -200,7 +198,6 @@ Requires: tmux Requires: gdb # support for installation from image and live & live image installations Requires: rsync -Recommends: zram-generator-defaults %description install-env-deps The anaconda-install-env-deps metapackage lists all installation environment dependencies. @@ -422,6 +419,16 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Mar 30 2021 Martin Kolman - 34.24.7-1 +- network: match also connections named by MAC created by NM in initramfs + (rvykydal) +- Create /tmp with the right permissions (#1937626) (vponcova) +- Don't recommend zram-generator-defaults (#1938132) (vponcova) +- Don't automatically execute the default partitioning (vponcova) +- Fix the warning about working NTP servers (#1889180) (vponcova) +- Remove implicit dependencies (vponcova) +- Don't install anaconda-install-env-deps by default (vponcova) + * 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) diff --git a/sources b/sources index 0c1c7b7..ecd8f91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-34.24.6.tar.bz2) = 5e41b0e2b22ac15c54684c1d28519a70029484890d9b49d46e21a117dcec49935209a57acf4c6886d87411870a25a7571aff627914e91210cfd45d4d06dac287 +SHA512 (anaconda-34.24.7.tar.bz2) = 37dd7762eb83394bb44f67aab6fc41a83666b38df974750bfd6ab4ba3b7a09b007bab7e94d490171a99f46330424923283f6b631042524423cdb637e7932f353 From 77a3c478b64f78a282654c58312db8c93a14b2e5 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Wed, 31 Mar 2021 18:08:04 +0200 Subject: [PATCH 12/13] New version 34.24.8-1 - ostree: ignore exit code 65 for systemd-tmpfiles (vponcova) - Turn off wrapping of the scale values (vponcova) - Make the scale visible by default (#1943370) (vponcova) --- .gitignore | 1 + anaconda.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a388034..599ca4a 100644 --- a/.gitignore +++ b/.gitignore @@ -280,3 +280,4 @@ /anaconda-34.24.5.tar.bz2 /anaconda-34.24.6.tar.bz2 /anaconda-34.24.7.tar.bz2 +/anaconda-34.24.8.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 6e2bb8d..3530ad2 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 34.24.7 +Version: 34.24.8 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -419,6 +419,11 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Wed Mar 31 2021 Martin Kolman - 34.24.8-1 +- ostree: ignore exit code 65 for systemd-tmpfiles (vponcova) +- Turn off wrapping of the scale values (vponcova) +- Make the scale visible by default (#1943370) (vponcova) + * Tue Mar 30 2021 Martin Kolman - 34.24.7-1 - network: match also connections named by MAC created by NM in initramfs (rvykydal) diff --git a/sources b/sources index ecd8f91..f35e9e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-34.24.7.tar.bz2) = 37dd7762eb83394bb44f67aab6fc41a83666b38df974750bfd6ab4ba3b7a09b007bab7e94d490171a99f46330424923283f6b631042524423cdb637e7932f353 +SHA512 (anaconda-34.24.8.tar.bz2) = aeed802866f44cb39db14da9db57bf6c5d91d3bcc95485e2e069cef4d5b08e4901029e73888681d86550988556257bff71f562da7f97ab6a9f5e36977a5547de From 34dc7575c8cead4bc16378d0c2bb5d5bd77f72a4 Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Mon, 12 Apr 2021 14:51:25 +0200 Subject: [PATCH 13/13] New version 34.24.9-1 - Allow to exclude the kernel-lpae package (vponcova) --- .gitignore | 1 + anaconda.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 599ca4a..54d278e 100644 --- a/.gitignore +++ b/.gitignore @@ -281,3 +281,4 @@ /anaconda-34.24.6.tar.bz2 /anaconda-34.24.7.tar.bz2 /anaconda-34.24.8.tar.bz2 +/anaconda-34.24.9.tar.bz2 diff --git a/anaconda.spec b/anaconda.spec index 3530ad2..0b43b14 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 34.24.8 +Version: 34.24.9 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -419,6 +419,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Apr 12 2021 Martin Kolman - 34.24.9-1 +- Allow to exclude the kernel-lpae package (vponcova) + * Wed Mar 31 2021 Martin Kolman - 34.24.8-1 - ostree: ignore exit code 65 for systemd-tmpfiles (vponcova) - Turn off wrapping of the scale values (vponcova) diff --git a/sources b/sources index f35e9e5..4362885 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (anaconda-34.24.8.tar.bz2) = aeed802866f44cb39db14da9db57bf6c5d91d3bcc95485e2e069cef4d5b08e4901029e73888681d86550988556257bff71f562da7f97ab6a9f5e36977a5547de +SHA512 (anaconda-34.24.9.tar.bz2) = cf2e558339ca687dc1170e06e84e1709ff7a9ce4c6589d3cb2a2eb46f11ca4d7608b7ed5b82e9307d23271fcabf82955e87a494126449b4d25d2d78026fb55ed