diff --git a/anaconda.spec b/anaconda.spec index 331d4a2..2db6bcb 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ %define _empty_manifest_terminate_build 0 Name: anaconda Version: 33.19 -Release: 15 +Release: 16 Summary: Graphical system installer License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -28,6 +28,7 @@ Patch9015: bugfix-add-kdump-parameter-into-kernel-cmdline.patch Patch9016: bugfix-fix-password-policy.patch Patch9017: add-boot-args-for-smmu-and-video.patch Patch9018: disable-disk-encryption.patch +Patch9019: bugfix-set-up-LD_PRELOAD-for-the-Storage-and-Services-module.patch Patch6001: anaconda-Fix-stage2-as-default-sources.patch Patch6002: anaconda-Allow-to-detect-devices-with-the-iso9660-file-system.patch @@ -266,6 +267,12 @@ update-desktop-database &> /dev/null || : %{_datadir}/gtk-doc %changelog +* Thu Jan 14 2021 yuboyun - 33.19-16 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:set up LD_PRELOAD for the Storage and Services module + * Thu Dec 10 2020 zhouyihang - 33.19-15 - Type:bugfix - ID:NA diff --git a/bugfix-set-up-LD_PRELOAD-for-the-Storage-and-Services-module.patch b/bugfix-set-up-LD_PRELOAD-for-the-Storage-and-Services-module.patch new file mode 100644 index 0000000..674500a --- /dev/null +++ b/bugfix-set-up-LD_PRELOAD-for-the-Storage-and-Services-module.patch @@ -0,0 +1,65 @@ +From 769f395e80c92972900ef348d7dd747014666f70 Mon Sep 17 00:00:00 2001 +From: yu_boyun <1215979730@qq.com> +Date: Mon, 11 Jan 2021 17:01:58 +0800 +Subject: [PATCH] set up LD_PRELOAD for the Storage and Services module + +--- + data/dbus/org.fedoraproject.Anaconda.Modules.Services.service | 2 +- + data/dbus/org.fedoraproject.Anaconda.Modules.Storage.service | 2 +- + pyanaconda/modules/services/__main__.py | 4 ++++ + pyanaconda/modules/storage/__main__.py | 4 ++++ + 4 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/data/dbus/org.fedoraproject.Anaconda.Modules.Services.service b/data/dbus/org.fedoraproject.Anaconda.Modules.Services.service +index 79c6949..c3a6098 100644 +--- a/data/dbus/org.fedoraproject.Anaconda.Modules.Services.service ++++ b/data/dbus/org.fedoraproject.Anaconda.Modules.Services.service +@@ -1,4 +1,4 @@ + [D-BUS Service] + Name=org.fedoraproject.Anaconda.Modules.Services +-Exec=/usr/libexec/anaconda/start-module pyanaconda.modules.services ++Exec=/usr/libexec/anaconda/start-module --env LD_PRELOAD=libgomp.so.1 pyanaconda.modules.services + User=root +diff --git a/data/dbus/org.fedoraproject.Anaconda.Modules.Storage.service b/data/dbus/org.fedoraproject.Anaconda.Modules.Storage.service +index 018ecf1..780200e 100644 +--- a/data/dbus/org.fedoraproject.Anaconda.Modules.Storage.service ++++ b/data/dbus/org.fedoraproject.Anaconda.Modules.Storage.service +@@ -1,4 +1,4 @@ + [D-BUS Service] + Name=org.fedoraproject.Anaconda.Modules.Storage +-Exec=/usr/libexec/anaconda/start-module pyanaconda.modules.storage ++Exec=/usr/libexec/anaconda/start-module --env LD_PRELOAD=libgomp.so.1 pyanaconda.modules.storage + User=root +diff --git a/pyanaconda/modules/services/__main__.py b/pyanaconda/modules/services/__main__.py +index d4b0879..4327dc9 100644 +--- a/pyanaconda/modules/services/__main__.py ++++ b/pyanaconda/modules/services/__main__.py +@@ -20,6 +20,10 @@ + from pyanaconda.modules.common import init + init() + ++import os ++if "LD_PRELOAD" in os.environ: ++ del os.environ["LD_PRELOAD"] ++ + from pyanaconda.modules.services.services import ServicesService + service = ServicesService() + service.run() +diff --git a/pyanaconda/modules/storage/__main__.py b/pyanaconda/modules/storage/__main__.py +index 327a129..29212a9 100644 +--- a/pyanaconda/modules/storage/__main__.py ++++ b/pyanaconda/modules/storage/__main__.py +@@ -20,6 +20,10 @@ + from pyanaconda.modules.common import init + init("/tmp/storage.log") + ++import os ++if "LD_PRELOAD" in os.environ: ++ del os.environ["LD_PRELOAD"] ++ + # Initialize Blivet. + from pyanaconda.modules.storage.initialization import enable_installer_mode + enable_installer_mode() +-- +1.8.3.1 +