[kexec-tools] kdumpctl: remove obsolete code
Cong Wang
wangcong at fedoraproject.org
Mon Jul 25 10:04:48 UTC 2011
commit 4a7c91284819cb9e7dc0bcc1015ac0419587fdf8
Author: Amerigo Wang <amwang at redhat.com>
Date: Mon Jul 25 18:04:32 2011 +0800
kdumpctl: remove obsolete code
kdumpctl | 21 ++-------------------
kexec-tools.spec | 5 ++++-
2 files changed, 6 insertions(+), 20 deletions(-)
---
diff --git a/kdumpctl b/kdumpctl
index 05d225e..7288c43 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -9,6 +9,7 @@ KDUMP_KERNELVER=""
KDUMP_COMMANDLINE=""
KEXEC_ARGS=""
KDUMP_CONFIG_FILE="/etc/kdump.conf"
+MKDUMPRD="/sbin/mkdumprd -d -f"
LOGGER="/usr/bin/logger -p info -t kdump"
@@ -45,26 +46,8 @@ function save_core()
function check_config()
{
- if [ -f /etc/kdump-adv-conf/initramfs.conf ]
- then
- $LOGGER "Using Kdump advanced configuration service"
- if [ -n "$DRACUT_CMD" ]
- then
- MKDUMPRD=$DRACUT_CMD
- else
- MKDUMPRD="dracut -f -c /etc/kdump-adv-conf/initramfs.conf"
- fi
- # We always rebuild here, since it takes longer
- # to figure out if anything has changed
- touch /etc/kdump.conf
- else
- MKDUMPRD="/sbin/mkdumprd -d -f"
- fi
-
if [ -z "$KDUMP_KERNELVER" ]; then
- local running_kernel=`uname -r`
-
- kdump_kver=`echo $running_kernel | sed 's/smp//g'`
+ kdump_kver=`uname -r`
else
kdump_kver=$KDUMP_KERNELVER
fi
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 238497b..a94d5ab 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,6 +1,6 @@
Name: kexec-tools
Version: 2.0.2
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2
Group: Applications/System
Summary: The kexec/kdump userspace component.
@@ -281,6 +281,9 @@ done
%changelog
+* Mon Jul 25 2011 Cong Wang <xiyou.wangcong at gmail.com> - 2.0.2-7
+- Remove obsolete code in kdumpctl.
+
* Mon Jul 25 2011 Cong Wang <xiyou.wangcong at gmail.com> - 2.0.2-6
- Support core_collector and extran_bins.
More information about the scm-commits
mailing list