From 1719a8aa928bc424671c599f1e97d116abef3564 Mon Sep 17 00:00:00 2001 From: WANG Chao Date: Thu, 31 Jul 2014 14:32:30 +0800 Subject: [PATCH] do not force shutdown It's more safe to use systemd (init) to control the shutdown path for us in either reboot or power off or halt action. Signed-off-by: WANG Chao Acked-by: Vivek Goyal --- kdump-lib-initramfs.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kdump-lib-initramfs.sh b/kdump-lib-initramfs.sh index 1517712..6927d27 100755 --- a/kdump-lib-initramfs.sh +++ b/kdump-lib-initramfs.sh @@ -6,14 +6,14 @@ KDUMP_PATH="/var/crash" CORE_COLLECTOR="" DEFAULT_CORE_COLLECTOR="makedumpfile -l --message-level 1 -d 31" DMESG_COLLECTOR="/sbin/vmcore-dmesg" -DEFAULT_ACTION="reboot -f" +DEFAULT_ACTION="reboot" DATEDIR=`date +%Y.%m.%d-%T` HOST_IP='127.0.0.1' DUMP_INSTRUCTION="" SSH_KEY_LOCATION="/root/.ssh/kdump_id_rsa" KDUMP_SCRIPT_DIR="/kdumpscripts" DD_BLKSIZE=512 -FINAL_ACTION="reboot -f" +FINAL_ACTION="reboot" KDUMP_CONF="/etc/kdump.conf" KDUMP_PRE="" KDUMP_POST="" @@ -59,13 +59,13 @@ get_kdump_confs() DEFAULT_ACTION="kdump_emergency_shell" ;; reboot) - DEFAULT_ACTION="do_umount; reboot -f" + DEFAULT_ACTION="do_umount; reboot" ;; halt) - DEFAULT_ACTION="do_umount; halt -f" + DEFAULT_ACTION="do_umount; halt" ;; poweroff) - DEFAULT_ACTION="do_umount; poweroff -f" + DEFAULT_ACTION="do_umount; poweroff" ;; dump_to_rootfs) DEFAULT_ACTION="dump_to_rootfs"