Merge branch 'f17'
This commit is contained in:
commit
4b48dbb442
@ -13,7 +13,7 @@ KDUMP_COMMANDLINE=""
|
||||
|
||||
# This variable lets us append arguments to the current kdump commandline
|
||||
# As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline
|
||||
KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 noirqdistrib reset_devices"
|
||||
KDUMP_COMMANDLINE_APPEND="irqpoll maxcpus=1 noirqdistrib reset_devices cgroup_disable=memory"
|
||||
|
||||
# Any additional kexec arguments required. In most situations, this should
|
||||
# be left empty
|
||||
@ -26,7 +26,7 @@ KEXEC_ARGS=""
|
||||
KDUMP_BOOTDIR="/boot"
|
||||
|
||||
#What is the image type used for kdump
|
||||
KDUMP_IMG="vmlinux"
|
||||
KDUMP_IMG="vmlinuz"
|
||||
|
||||
#What is the images extension. Relocatable kernels don't have one
|
||||
KDUMP_IMG_EXT="kdump"
|
||||
KDUMP_IMG_EXT=""
|
||||
|
@ -13,7 +13,7 @@ KDUMP_COMMANDLINE=""
|
||||
|
||||
# This variable lets us append arguments to the current kdump commandline
|
||||
# As taken from either KDUMP_COMMANDLINE above, or from /proc/cmdline
|
||||
KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices"
|
||||
KDUMP_COMMANDLINE_APPEND="irqpoll nr_cpus=1 reset_devices cgroup_disable=memory mce=off"
|
||||
|
||||
# Any additional kexec arguments required. In most situations, this should
|
||||
# be left empty
|
||||
|
@ -71,7 +71,8 @@ install() {
|
||||
# we are on the same subnet
|
||||
_netdev=`echo $_netdev|awk '{print $3}'|head -n 1`
|
||||
fi
|
||||
echo " ip=$_netdev:dhcp rd.neednet=1" > ${initdir}/etc/cmdline.d/40ip.conf
|
||||
_netmac=`ip addr show $_netdev 2>/dev/null|awk '/ether/{ print $2 }'`
|
||||
echo " ip=$_netdev:dhcp ifname=$_netdev:$_netmac rd.neednet=1" > ${initdir}/etc/cmdline.d/40ip.conf
|
||||
if is_bridge "$_netdev"; then
|
||||
echo " bridge=$_netdev:$(cd /sys/class/net/$_netdev/brif/; echo *)" > ${initdir}/etc/cmdline.d/41bridge.conf
|
||||
elif is_bond "$_netdev"; then
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: kexec-tools
|
||||
Version: 2.0.3
|
||||
Release: 43%{?dist}
|
||||
Release: 45%{?dist}
|
||||
License: GPLv2
|
||||
Group: Applications/System
|
||||
Summary: The kexec/kdump userspace component.
|
||||
@ -285,6 +285,14 @@ done
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Apr 23 2012 Dave Young <ruyang@redhat.com> - 2.0.3-45
|
||||
- update dracut-files.tbz2
|
||||
|
||||
* Thu Apr 19 2012 Dave Young <dyoung@redhat.com> - 2.0.3-44
|
||||
- update ppc64 sysconfig, resolve bug 811449
|
||||
- deal with nic rename issue, resolve bug 810107
|
||||
- update x86_64 sysconfig, resolve bug 813711
|
||||
|
||||
* Wed Apr 11 2012 Cong Wang <xiyou.wangcong@gmail.com> - 2.0.3-43
|
||||
- variable name fix from Dave Young.
|
||||
|
||||
|
2
sources
2
sources
@ -1,4 +1,4 @@
|
||||
3e802d638dce0080b910f15908c04a24 kexec-tools-po.tar.gz
|
||||
b3ced2097ce3981abba38ceedc84f939 kexec-tools-2.0.3.tar.bz2
|
||||
a98917a8dab5e590549bff9fe7b3a5c2 makedumpfile-1.4.2.tar.gz
|
||||
46e5e863576723462b2d2b1b79e92423 dracut-files.tbz2
|
||||
68c1a0de35d680a6ed89576ef6cd815f dracut-files.tbz2
|
||||
|
Loading…
Reference in New Issue
Block a user