From 579e1725d02e3794ffac922a2fc78b09542f0ca5 Mon Sep 17 00:00:00 2001 From: Dave Young Date: Tue, 4 Aug 2015 13:28:53 +0800 Subject: [PATCH] Update kdump addon Moving isys.total_memory() call to class method to avoid installation hangs. It is possible because totoal_memory will call log.info which need log lock. but some loging function need import gettext module which need import lock. Thus deadlock could happen. Moved isys.total_memory callback to class method instead. --- .gitignore | 1 + kexec-tools.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0368407..fdf0606 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /kexec-tools-2.0.10.tar.xz /kdump-anaconda-addon-005-10-gd16915f.tar.gz /kdump-anaconda-addon-005-11-g59f9b73.tar.gz +/kdump-anaconda-addon-005-12-g60fa4c1.tar.gz diff --git a/kexec-tools.spec b/kexec-tools.spec index a819b03..ef669b2 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -24,7 +24,7 @@ Source19: eppic_050615.tar.gz Source20: kdump-lib.sh Source21: kdump-in-cluster-environment.txt Source22: kdump-dep-generator.sh -Source23: kdump-anaconda-addon-005-11-g59f9b73.tar.gz +Source23: kdump-anaconda-addon-005-12-g60fa4c1.tar.gz Source24: kdump-lib-initramfs.sh Source25: kdump.sysconfig.ppc64le diff --git a/sources b/sources index 99eaa19..1c899ef 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ 642d975349dff744c6027d4486499258 makedumpfile-1.5.8.tar.gz 43e84f9d3e5b7ba939cc05035a6fb78a eppic_050615.tar.gz 70c7e63af2274e040812b243c26ccac8 kexec-tools-2.0.10.tar.xz -5c75e84714e33152eb0fba99b84326b8 kdump-anaconda-addon-005-11-g59f9b73.tar.gz +acf442c56fa243808ae577b86668e9ef kdump-anaconda-addon-005-12-g60fa4c1.tar.gz