From 929c78bba098307ccb47f55bf5de3a904637a5f8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 23 2014 06:11:16 +0000 Subject: import kexec-tools-2.0.4-32.el7_0.5 --- diff --git a/SOURCES/dracut-module-setup.sh b/SOURCES/dracut-module-setup.sh index f12ce22..9538c1e 100755 --- a/SOURCES/dracut-module-setup.sh +++ b/SOURCES/dracut-module-setup.sh @@ -229,7 +229,10 @@ kdump_setup_netdev() { # dracut doesn't allow duplicated configuration for same NIC, even they're exactly the same. # so we have to avoid adding duplicates - if [ ! -f $_ip_conf ] || ! grep -q $_ip_opts $_ip_conf; then + # We should also check /proc/cmdline for existing ip=xx arg. + # For example, iscsi boot will specify ip=xxx arg in cmdline. + if [ ! -f $_ip_conf ] || ! grep -q $_ip_opts $_ip_conf &&\ + ! grep -q "ip=[^[:space:]]*$_netdev" /proc/cmdline; then echo "$_ip_opts" >> $_ip_conf fi diff --git a/SOURCES/firstboot_kdump.py b/SOURCES/firstboot_kdump.py index a8cd3ba..2bdec5b 100755 --- a/SOURCES/firstboot_kdump.py +++ b/SOURCES/firstboot_kdump.py @@ -57,10 +57,10 @@ class moduleClass(Module): # possible bootloaders we'll need to adjust # bootloader : (config file, kdump offset) bootloaders = { "grub" : (["/boot/grub/grub.conf", \ - "/boot/efi/EFI/centos/grub.conf"], [16, 256]),\ + "/boot/efi/EFI/redhat/grub.conf"], [16, 256]),\ "grub2" : (["/boot/grub2/grub.cfg", \ "/boot/efi/EFI/fedora/grub.cfg", \ - "/boot/efi/EFI/centos/grub.cfg"], [16, 256]),\ + "/boot/efi/EFI/redhat/grub.cfg"], [16, 256]),\ "zipl" : (["/etc/zipl.conf"], [0]),\ "yaboot" : (["/boot/etc/yaboot.conf"], [32]) } bootloader = None diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec index 47358a3..1bb898e 100644 --- a/SPECS/kexec-tools.spec +++ b/SPECS/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 2.0.4 -Release: 32%{?dist}.4 +Release: 32%{?dist}.5 License: GPLv2 Group: Applications/System Summary: The kexec/kdump userspace component. @@ -380,8 +380,8 @@ done %endif %changelog -* Fri Sep 26 2014 Johnny Hughes - 2.0.4-32.4.el7.centos -- modify SOURCE firstboot_kdump.py to include centos in EFI +* Wed Oct 08 2014 WANG Chao - 2.0.4-32.5 +- Fix an issue on iscsi boot environment * Mon Sep 15 2014 WANG Chao - 2.0.4-32.4 - Fix a segmentation fault when physical address exceeds 8TB boundary.