Signed-off-by: Coiby Xu <coxu(a)redhat.com>
---
dracut-early-kdump.sh | 84 ++++----
dracut-fadump-init-fadump.sh | 2 +-
kdump-dep-generator.sh | 6 +-
kdump-lib.sh | 7 +-
kdump-logger.sh | 378 +++++++++++++++++++----------------
kdump-migrate-action.sh | 2 +-
kdump-restart.sh | 2 +-
kdumpctl | 66 +++---
8 files changed, 286 insertions(+), 261 deletions(-)
diff --git a/dracut-early-kdump.sh b/dracut-early-kdump.sh
index 45ee6dc..eb2e886 100755
--- a/dracut-early-kdump.sh
+++ b/dracut-early-kdump.sh
@@ -16,69 +16,69 @@ EARLY_KEXEC_ARGS=""
# initiate the kdump logger
if ! dlog_init; then
- echo "failed to initiate the kdump logger."
- exit 1
+ echo "failed to initiate the kdump logger."
+ exit 1
fi
prepare_parameters()
{
- EARLY_KDUMP_CMDLINE=$(prepare_cmdline "${KDUMP_COMMANDLINE}"
"${KDUMP_COMMANDLINE_REMOVE}" "${KDUMP_COMMANDLINE_APPEND}")
- EARLY_KDUMP_KERNEL="/boot/kernel-earlykdump"
- EARLY_KDUMP_INITRD="/boot/initramfs-earlykdump"
+ EARLY_KDUMP_CMDLINE=$(prepare_cmdline "${KDUMP_COMMANDLINE}"
"${KDUMP_COMMANDLINE_REMOVE}" "${KDUMP_COMMANDLINE_APPEND}")
+ EARLY_KDUMP_KERNEL="/boot/kernel-earlykdump"
+ EARLY_KDUMP_INITRD="/boot/initramfs-earlykdump"
}
early_kdump_load()
{
- if ! check_kdump_feasibility; then
- return 1
- fi
+ if ! check_kdump_feasibility; then
+ return 1
+ fi
- if is_fadump_capable; then
- dwarn "WARNING: early kdump doesn't support fadump."
- return 1
- fi
+ if is_fadump_capable; then
+ dwarn "WARNING: early kdump doesn't support fadump."
+ return 1
+ fi
- if check_current_kdump_status; then
- return 1
- fi
+ if check_current_kdump_status; then
+ return 1
+ fi
- prepare_parameters
+ prepare_parameters
- EARLY_KEXEC_ARGS=$(prepare_kexec_args "${KEXEC_ARGS}")
+ EARLY_KEXEC_ARGS=$(prepare_kexec_args "${KEXEC_ARGS}")
- if is_secure_boot_enforced; then
- dinfo "Secure Boot is enabled. Using kexec file based syscall."
- EARLY_KEXEC_ARGS="$EARLY_KEXEC_ARGS -s"
- fi
+ if is_secure_boot_enforced; then
+ dinfo "Secure Boot is enabled. Using kexec file based syscall."
+ EARLY_KEXEC_ARGS="$EARLY_KEXEC_ARGS -s"
+ fi
- # Here, only output the messages, but do not save these messages
- # to a file because the target disk may not be mounted yet, the
- # earlykdump is too early.
- ddebug "earlykdump: $KEXEC ${EARLY_KEXEC_ARGS} $standard_kexec_args \
+ # Here, only output the messages, but do not save these messages
+ # to a file because the target disk may not be mounted yet, the
+ # earlykdump is too early.
+ ddebug "earlykdump: $KEXEC ${EARLY_KEXEC_ARGS} $standard_kexec_args \
--command-line=$EARLY_KDUMP_CMDLINE --initrd=$EARLY_KDUMP_INITRD \
$EARLY_KDUMP_KERNEL"
- if $KEXEC $EARLY_KEXEC_ARGS $standard_kexec_args \
- --command-line="$EARLY_KDUMP_CMDLINE" \
- --initrd=$EARLY_KDUMP_INITRD $EARLY_KDUMP_KERNEL; then
- dinfo "kexec: loaded early-kdump kernel"
- return 0
- else
- derror "kexec: failed to load early-kdump kernel"
- return 1
- fi
+ if $KEXEC $EARLY_KEXEC_ARGS $standard_kexec_args \
+ --command-line="$EARLY_KDUMP_CMDLINE" \
+ --initrd=$EARLY_KDUMP_INITRD $EARLY_KDUMP_KERNEL; then
+ dinfo "kexec: loaded early-kdump kernel"
+ return 0
+ else
+ derror "kexec: failed to load early-kdump kernel"
+ return 1
+ fi
}
set_early_kdump()
{
- if getargbool 0 rd.earlykdump; then
- dinfo "early-kdump is enabled."
- early_kdump_load
- else
- dinfo "early-kdump is disabled."
- fi
-
- return 0
+ if getargbool 0 rd.earlykdump; then
+ dinfo "early-kdump is enabled."
+ early_kdump_load
+ else
+ dinfo "early-kdump is disabled."
+ fi
+
+ return 0
}
set_early_kdump
diff --git a/dracut-fadump-init-fadump.sh b/dracut-fadump-init-fadump.sh
index 94a3751..3e72c70 100755
--- a/dracut-fadump-init-fadump.sh
+++ b/dracut-fadump-init-fadump.sh
@@ -37,7 +37,7 @@ if [ -f /proc/device-tree/rtas/ibm,kernel-dump ] || [ -f
/proc/device-tree/ibm,o
case $mp in
/oldroot/*) umount -d "$mp" && loop=1 ;;
esac
- done </proc/mounts
+ done < /proc/mounts
done
umount -d -l oldroot
diff --git a/kdump-dep-generator.sh b/kdump-dep-generator.sh
index f48c8f6..0eb8482 100644
--- a/kdump-dep-generator.sh
+++ b/kdump-dep-generator.sh
@@ -11,13 +11,13 @@
dest_dir="/tmp"
if [ -n "$1" ]; then
- dest_dir=$1
+ dest_dir=$1
fi
systemd_dir=/usr/lib/systemd/system
kdump_wants=$dest_dir/kdump.service.wants
if is_ssh_dump_target; then
- mkdir -p $kdump_wants
- ln -sf $systemd_dir/network-online.target $kdump_wants/
+ mkdir -p $kdump_wants
+ ln -sf $systemd_dir/network-online.target $kdump_wants/
fi
diff --git a/kdump-lib.sh b/kdump-lib.sh
index f7b659e..e2fdbd2 100755
--- a/kdump-lib.sh
+++ b/kdump-lib.sh
@@ -451,8 +451,7 @@ is_wdt_active()
have_compression_in_dracut_args()
{
- [[ "$(kdump_get_conf_val dracut_args)" =~ \
- (^|[[:space:]])--(gzip|bzip2|lzma|xz|lzo|lz4|zstd|no-compress|compress)([[:space:]]|$)
]]
+ [[ "$(kdump_get_conf_val dracut_args)" =~
(^|[[:space:]])--(gzip|bzip2|lzma|xz|lzo|lz4|zstd|no-compress|compress)([[:space:]]|$) ]]
}
# If "dracut_args" contains "--mount" information, use it
@@ -829,7 +828,7 @@ PROC_IOMEM=/proc/iomem
get_system_size()
{
sum=$(sed -n "s/\s*\([0-9a-fA-F]\+\)-\([0-9a-fA-F]\+\) : System RAM$/+ 0x\2 - 0x\1
+ 1/p" $PROC_IOMEM)
- echo $(( (sum) / 1024 / 1024 / 1024))
+ echo $(((sum) / 1024 / 1024 / 1024))
}
# Return the recommended size for the reserved crashkernel memory
@@ -927,7 +926,7 @@ get_luks_crypt_dev()
[[ -b /dev/block/$1 ]] || return 1
- _type=$(blkid -u filesystem,crypto -o export -- "/dev/block/$1" | \
+ _type=$(blkid -u filesystem,crypto -o export -- "/dev/block/$1" |
sed -n -E "s/^TYPE=(.*)$/\1/p")
[[ $_type == "crypto_LUKS" ]] && echo "$1"
diff --git a/kdump-logger.sh b/kdump-logger.sh
index 3fd433d..20ac86e 100755
--- a/kdump-logger.sh
+++ b/kdump-logger.sh
@@ -46,7 +46,7 @@ kdump_kmsgloglvl=""
# be used in the first kernel because the dracut-lib.sh is invisible in
# the first kernel.
if [ -f /lib/dracut-lib.sh ]; then
- . /lib/dracut-lib.sh
+ . /lib/dracut-lib.sh
fi
# @brief Get the log level from kernel command line.
@@ -55,14 +55,14 @@ fi
#
get_kdump_loglvl()
{
- [ -f /lib/dracut-lib.sh ] && kdump_sysloglvl=$(getarg rd.kdumploglvl)
- [ -z "$kdump_sysloglvl" ] && return 1;
+ [ -f /lib/dracut-lib.sh ] && kdump_sysloglvl=$(getarg rd.kdumploglvl)
+ [ -z "$kdump_sysloglvl" ] && return 1
- if [ -f /lib/dracut-lib.sh ] && ! isdigit "$kdump_sysloglvl"; then
- return 1
- fi
+ if [ -f /lib/dracut-lib.sh ] && ! isdigit "$kdump_sysloglvl"; then
+ return 1
+ fi
- return 0
+ return 0
}
# @brief Check the log level.
@@ -71,105 +71,121 @@ get_kdump_loglvl()
#
check_loglvl()
{
- case "$1" in
- 0|1|2|3|4)
- return 0
- ;;
- *)
- return 1
- ;;
- esac
+ case "$1" in
+ 0 | 1 | 2 | 3 | 4)
+ return 0
+ ;;
+ *)
+ return 1
+ ;;
+ esac
}
# @brief Initializes Logger.
# @retval 1 if something has gone wrong
# @retval 0 on success.
#
-dlog_init() {
- ret=0
-
- if [ -s /proc/vmcore ];then
- if ! get_kdump_loglvl; then
- logger -t "kdump[$$]" -p warn -- "Kdump is using the default
log level(3)."
- kdump_sysloglvl=3
- fi
- kdump_stdloglvl=0
- kdump_kmsgloglvl=0
- else
- kdump_stdloglvl=$KDUMP_STDLOGLVL
- kdump_sysloglvl=$KDUMP_SYSLOGLVL
- kdump_kmsgloglvl=$KDUMP_KMSGLOGLVL
- fi
-
- [ -z "$kdump_stdloglvl" ] && kdump_stdloglvl=3
- [ -z "$kdump_sysloglvl" ] && kdump_sysloglvl=0
- [ -z "$kdump_kmsgloglvl" ] && kdump_kmsgloglvl=0
-
- for loglvl in "$kdump_stdloglvl" "$kdump_kmsgloglvl"
"$kdump_sysloglvl"; do
- if ! check_loglvl "$loglvl"; then
- echo "Illegal log level: $kdump_stdloglvl $kdump_kmsgloglvl
$kdump_sysloglvl"
- return 1
- fi
- done
-
- # Skip initialization if it's already done.
- [ -n "$kdump_maxloglvl" ] && return 0
-
- if [ "$UID" -ne 0 ]; then
- kdump_kmsgloglvl=0
- kdump_sysloglvl=0
- fi
-
- if [ "$kdump_sysloglvl" -gt 0 ]; then
- if [ -d /run/systemd/journal ] \
- && systemd-cat --version 1>/dev/null 2>&1 \
- && systemctl --quiet is-active systemd-journald.socket 1>/dev/null
2>&1; then
- readonly _systemdcatfile="/var/tmp/systemd-cat"
- mkfifo "$_systemdcatfile" 1>/dev/null 2>&1
- readonly _dlogfd=15
- systemd-cat -t 'kdump' --level-prefix=true
<"$_systemdcatfile" &
- exec 15>"$_systemdcatfile"
- elif ! [ -S /dev/log ] && [ -w /dev/log ] || ! command -v logger
>/dev/null; then
- # We cannot log to syslog, so turn this facility off.
- kdump_kmsgloglvl=$kdump_sysloglvl
- kdump_sysloglvl=0
- ret=1
- errmsg="No '/dev/log' or 'logger' included for syslog
logging"
- fi
- fi
-
- kdump_maxloglvl=0
- for _dlog_lvl in $kdump_stdloglvl $kdump_sysloglvl $kdump_kmsgloglvl; do
- [ $_dlog_lvl -gt $kdump_maxloglvl ] && kdump_maxloglvl=$_dlog_lvl
- done
- readonly kdump_maxloglvl
- export kdump_maxloglvl
-
- if [ $kdump_stdloglvl -lt 4 ] && [ $kdump_kmsgloglvl -lt 4 ] && [
$kdump_sysloglvl -lt 4 ]; then
- unset ddebug
- ddebug() { :; };
- fi
-
- if [ $kdump_stdloglvl -lt 3 ] && [ $kdump_kmsgloglvl -lt 3 ] && [
$kdump_sysloglvl -lt 3 ]; then
- unset dinfo
- dinfo() { :; };
- fi
-
- if [ $kdump_stdloglvl -lt 2 ] && [ $kdump_kmsgloglvl -lt 2 ] && [
$kdump_sysloglvl -lt 2 ]; then
- unset dwarn
- dwarn() { :; };
- unset dwarning
- dwarning() { :; };
- fi
-
- if [ $kdump_stdloglvl -lt 1 ] && [ $kdump_kmsgloglvl -lt 1 ] && [
$kdump_sysloglvl -lt 1 ]; then
- unset derror
- derror() { :; };
- fi
-
- [ -n "$errmsg" ] && derror "$errmsg"
-
- return $ret
+dlog_init()
+{
+ ret=0
+
+ if [ -s /proc/vmcore ]; then
+ if ! get_kdump_loglvl; then
+ logger -t "kdump[$$]" -p warn -- "Kdump is using the default log
level(3)."
+ kdump_sysloglvl=3
+ fi
+ kdump_stdloglvl=0
+ kdump_kmsgloglvl=0
+ else
+ kdump_stdloglvl=$KDUMP_STDLOGLVL
+ kdump_sysloglvl=$KDUMP_SYSLOGLVL
+ kdump_kmsgloglvl=$KDUMP_KMSGLOGLVL
+ fi
+
+ [ -z "$kdump_stdloglvl" ] && kdump_stdloglvl=3
+ [ -z "$kdump_sysloglvl" ] && kdump_sysloglvl=0
+ [ -z "$kdump_kmsgloglvl" ] && kdump_kmsgloglvl=0
+
+ for loglvl in "$kdump_stdloglvl" "$kdump_kmsgloglvl"
"$kdump_sysloglvl"; do
+ if ! check_loglvl "$loglvl"; then
+ echo "Illegal log level: $kdump_stdloglvl $kdump_kmsgloglvl
$kdump_sysloglvl"
+ return 1
+ fi
+ done
+
+ # Skip initialization if it's already done.
+ [ -n "$kdump_maxloglvl" ] && return 0
+
+ if [ "$UID" -ne 0 ]; then
+ kdump_kmsgloglvl=0
+ kdump_sysloglvl=0
+ fi
+
+ if [ "$kdump_sysloglvl" -gt 0 ]; then
+ if [ -d /run/systemd/journal ] &&
+ systemd-cat --version 1> /dev/null 2>&1 &&
+ systemctl --quiet is-active systemd-journald.socket 1> /dev/null 2>&1; then
+ readonly _systemdcatfile="/var/tmp/systemd-cat"
+ mkfifo "$_systemdcatfile" 1> /dev/null 2>&1
+ readonly _dlogfd=15
+ systemd-cat -t 'kdump' --level-prefix=true < "$_systemdcatfile"
&
+ exec 15> "$_systemdcatfile"
+ elif ! [ -S /dev/log ] && [ -w /dev/log ] || ! command -v logger >
/dev/null; then
+ # We cannot log to syslog, so turn this facility off.
+ kdump_kmsgloglvl=$kdump_sysloglvl
+ kdump_sysloglvl=0
+ ret=1
+ errmsg="No '/dev/log' or 'logger' included for syslog
logging"
+ fi
+ fi
+
+ kdump_maxloglvl=0
+ for _dlog_lvl in $kdump_stdloglvl $kdump_sysloglvl $kdump_kmsgloglvl; do
+ [ $_dlog_lvl -gt $kdump_maxloglvl ] && kdump_maxloglvl=$_dlog_lvl
+ done
+ readonly kdump_maxloglvl
+ export kdump_maxloglvl
+
+ if [ $kdump_stdloglvl -lt 4 ] && [ $kdump_kmsgloglvl -lt 4 ] && [
$kdump_sysloglvl -lt 4 ]; then
+ unset ddebug
+ ddebug()
+ {
+ :
+ }
+ fi
+
+ if [ $kdump_stdloglvl -lt 3 ] && [ $kdump_kmsgloglvl -lt 3 ] && [
$kdump_sysloglvl -lt 3 ]; then
+ unset dinfo
+ dinfo()
+ {
+ :
+ }
+ fi
+
+ if [ $kdump_stdloglvl -lt 2 ] && [ $kdump_kmsgloglvl -lt 2 ] && [
$kdump_sysloglvl -lt 2 ]; then
+ unset dwarn
+ dwarn()
+ {
+ :
+ }
+ unset dwarning
+ dwarning()
+ {
+ :
+ }
+ fi
+
+ if [ $kdump_stdloglvl -lt 1 ] && [ $kdump_kmsgloglvl -lt 1 ] && [
$kdump_sysloglvl -lt 1 ]; then
+ unset derror
+ derror()
+ {
+ :
+ }
+ fi
+
+ [ -n "$errmsg" ] && derror "$errmsg"
+
+ return $ret
}
## @brief Converts numeric level to logger priority defined by POSIX.2.
@@ -178,14 +194,15 @@ dlog_init() {
# @retval 1 if @a lvl is out of range.
# @retval 0 if @a lvl is correct.
# @result Echoes logger priority.
-_lvl2syspri() {
- case "$1" in
- 1) echo error;;
- 2) echo warning;;
- 3) echo info;;
- 4) echo debug;;
- *) return 1;;
- esac
+_lvl2syspri()
+{
+ case "$1" in
+ 1) echo error ;;
+ 2) echo warning ;;
+ 3) echo info ;;
+ 4) echo debug ;;
+ *) return 1 ;;
+ esac
}
## @brief Converts logger numeric level to syslog log level
@@ -209,19 +226,20 @@ _lvl2syspri() {
# </tt>
#
# @see /usr/include/sys/syslog.h
-_dlvl2syslvl() {
- case "$1" in
- 1) set -- 3;;
- 2) set -- 4;;
- 3) set -- 6;;
- 4) set -- 7;;
- *) return 1;;
- esac
-
- # The number is constructed by multiplying the facility by 8 and then
- # adding the level.
- # About The Syslog Protocol, please refer to the RFC5424 for more details.
- echo $((24 + $1))
+_dlvl2syslvl()
+{
+ case "$1" in
+ 1) set -- 3 ;;
+ 2) set -- 4 ;;
+ 3) set -- 6 ;;
+ 4) set -- 7 ;;
+ *) return 1 ;;
+ esac
+
+ # The number is constructed by multiplying the facility by 8 and then
+ # adding the level.
+ # About The Syslog Protocol, please refer to the RFC5424 for more details.
+ echo $((24 + $1))
}
## @brief Prints to stderr, to syslog and/or /dev/kmsg given message with
@@ -249,19 +267,20 @@ _dlvl2syslvl() {
# - @c WARN to @c warning
# - @c INFO to @c info
# - @c DEBUG to @c debug
-_do_dlog() {
- [ "$1" -le $kdump_stdloglvl ] && printf -- 'kdump: %s\n'
"$2" >&2
-
- if [ "$1" -le $kdump_sysloglvl ]; then
- if [ "$_dlogfd" ]; then
- printf -- "<%s>%s\n" "$(($(_dlvl2syslvl "$1")
& 7))" "$2" 1>&$_dlogfd
- else
- logger -t "kdump[$$]" -p "$(_lvl2syspri "$1")"
-- "$2"
- fi
- fi
-
- [ "$1" -le $kdump_kmsgloglvl ] && \
- echo "<$(_dlvl2syslvl "$1")>kdump[$$] $2"
>/dev/kmsg
+_do_dlog()
+{
+ [ "$1" -le $kdump_stdloglvl ] && printf -- 'kdump: %s\n'
"$2" >&2
+
+ if [ "$1" -le $kdump_sysloglvl ]; then
+ if [ "$_dlogfd" ]; then
+ printf -- "<%s>%s\n" "$(($(_dlvl2syslvl "$1") &
7))" "$2" 1>&$_dlogfd
+ else
+ logger -t "kdump[$$]" -p "$(_lvl2syspri "$1")" --
"$2"
+ fi
+ fi
+
+ [ "$1" -le $kdump_kmsgloglvl ] &&
+ echo "<$(_dlvl2syslvl "$1")>kdump[$$] $2" > /dev/kmsg
}
## @brief Internal helper function for _do_dlog()
@@ -280,76 +299,83 @@ _do_dlog() {
# This enables:
# dwarn "This is a warning"
# echo "This is a warning" | dwarn
-dlog() {
- [ -z "$kdump_maxloglvl" ] && return 0
- [ "$1" -le "$kdump_maxloglvl" ] || return 0
-
- if [ $# -gt 1 ]; then
- _dlog_lvl=$1; shift
- _do_dlog "$_dlog_lvl" "$*"
- else
- while read -r line || [ -n "$line" ]; do
- _do_dlog "$1" "$line"
- done
- fi
+dlog()
+{
+ [ -z "$kdump_maxloglvl" ] && return 0
+ [ "$1" -le "$kdump_maxloglvl" ] || return 0
+
+ if [ $# -gt 1 ]; then
+ _dlog_lvl=$1
+ shift
+ _do_dlog "$_dlog_lvl" "$*"
+ else
+ while read -r line || [ -n "$line" ]; do
+ _do_dlog "$1" "$line"
+ done
+ fi
}
## @brief Logs message at DEBUG level (4)
#
# @param msg Message.
# @retval 0 It's always returned, even if logging failed.
-ddebug() {
- set +x
- dlog 4 "$@"
- if [ -n "$debug" ]; then
- set -x
- fi
+ddebug()
+{
+ set +x
+ dlog 4 "$@"
+ if [ -n "$debug" ]; then
+ set -x
+ fi
}
## @brief Logs message at INFO level (3)
#
# @param msg Message.
# @retval 0 It's always returned, even if logging failed.
-dinfo() {
- set +x
- dlog 3 "$@"
- if [ -n "$debug" ]; then
- set -x
- fi
+dinfo()
+{
+ set +x
+ dlog 3 "$@"
+ if [ -n "$debug" ]; then
+ set -x
+ fi
}
## @brief Logs message at WARN level (2)
#
# @param msg Message.
# @retval 0 It's always returned, even if logging failed.
-dwarn() {
- set +x
- dlog 2 "$@"
- if [ -n "$debug" ]; then
- set -x
- fi
+dwarn()
+{
+ set +x
+ dlog 2 "$@"
+ if [ -n "$debug" ]; then
+ set -x
+ fi
}
## @brief It's an alias to dwarn() function.
#
# @param msg Message.
# @retval 0 It's always returned, even if logging failed.
-dwarning() {
- set +x
- dwarn "$@"
- if [ -n "$debug" ]; then
- set -x
- fi
+dwarning()
+{
+ set +x
+ dwarn "$@"
+ if [ -n "$debug" ]; then
+ set -x
+ fi
}
## @brief Logs message at ERROR level (1)
#
# @param msg Message.
# @retval 0 It's always returned, even if logging failed.
-derror() {
- set +x
- dlog 1 "$@"
- if [ -n "$debug" ]; then
- set -x
- fi
+derror()
+{
+ set +x
+ dlog 1 "$@"
+ if [ -n "$debug" ]; then
+ set -x
+ fi
}
diff --git a/kdump-migrate-action.sh b/kdump-migrate-action.sh
index c516639..2fb8366 100755
--- a/kdump-migrate-action.sh
+++ b/kdump-migrate-action.sh
@@ -2,7 +2,7 @@
systemctl is-active kdump
if [ $? -ne 0 ]; then
- exit 0
+ exit 0
fi
/usr/lib/kdump/kdump-restart.sh
diff --git a/kdump-restart.sh b/kdump-restart.sh
index a9ecfc1..2adc20b 100644
--- a/kdump-restart.sh
+++ b/kdump-restart.sh
@@ -1,7 +1,7 @@
#!/bin/bash
export PATH="$PATH:/usr/bin:/usr/sbin"
-exec >>/var/log/kdump-migration.log 2>&1
+exec >> /var/log/kdump-migration.log 2>&1
echo "kdump: Partition Migration detected. Rebuilding initramfs image to
reload."
/usr/bin/kdumpctl rebuild
diff --git a/kdumpctl b/kdumpctl
index 126ecb9..49d834a 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -720,7 +720,7 @@ check_ssh_config()
[[ "${OPT[_fstype]}" == ssh ]] || return 0
- target=$(ssh -G "${OPT[_target]}" | sed -n -e
"s/^hostname[[:space:]]\+\([^[:space:]]*\).*$/\1/p")
+ target=$(ssh -G "${OPT[_target]}" | sed -n -e
"s/^hostname[[:space:]]\+\([^[:space:]]*\).*$/\1/p")
[[ ${OPT[_target]} =~ .*@.* ]] || return 1
if [[ ${OPT[_target]#*@} != "$target" ]]; then
derror "Invalid ssh destination ${OPT[_target]} provided."
@@ -788,7 +788,7 @@ propagate_ssh_key()
parse_config || return 1
- if [[ ${OPT[_fstype]} != ssh ]] ; then
+ if [[ ${OPT[_fstype]} != ssh ]]; then
derror "No ssh destination defined in $KDUMP_CONFIG_FILE."
derror "Please verify that $KDUMP_CONFIG_FILE contains 'ssh
<user>@<host>' and that it is properly formatted."
exit 1
@@ -1471,30 +1471,30 @@ reset_crashkernel()
for _opt in "$@"; do
case "$_opt" in
- --fadump=*)
- _val=${_opt#*=}
- if _dump_mode=$(get_dump_mode_by_fadump_val $_val); then
- _fadump_val=$_val
- else
- derror "failed to determine dump mode"
- exit
- fi
- ;;
- --kernel=*)
- _val=${_opt#*=}
- if ! _valid_grubby_kernel_path $_val; then
- derror "Invalid $_opt, please specify a valid kernel path, ALL or
DEFAULT"
- exit
- fi
- _grubby_kernel_path=$_val
- ;;
- --reboot)
- _reboot=yes
- ;;
- *)
- derror "$_opt not recognized"
- exit 1
- ;;
+ --fadump=*)
+ _val=${_opt#*=}
+ if _dump_mode=$(get_dump_mode_by_fadump_val $_val); then
+ _fadump_val=$_val
+ else
+ derror "failed to determine dump mode"
+ exit
+ fi
+ ;;
+ --kernel=*)
+ _val=${_opt#*=}
+ if ! _valid_grubby_kernel_path $_val; then
+ derror "Invalid $_opt, please specify a valid kernel path, ALL or DEFAULT"
+ exit
+ fi
+ _grubby_kernel_path=$_val
+ ;;
+ --reboot)
+ _reboot=yes
+ ;;
+ *)
+ derror "$_opt not recognized"
+ exit 1
+ ;;
esac
done
@@ -1553,10 +1553,10 @@ reset_crashkernel()
if [[ -z $_grubby_kernel_path ]]; then
if [[ -z $KDUMP_KERNELVER ]] ||
! _kernel_path=$(_find_kernel_path_by_release "$KDUMP_KERNELVER"); then
- if ! _kernel_path=$(_get_current_running_kernel_path); then
- derror "no running kernel found"
- exit 1
- fi
+ if ! _kernel_path=$(_get_current_running_kernel_path); then
+ derror "no running kernel found"
+ exit 1
+ fi
fi
_kernels=$_kernel_path
else
@@ -1618,9 +1618,9 @@ update_crashkernel_in_grub_etc_default_after_update()
_new_default_crashkernel=${_crashkernel_vals[new_${_dump_mode}]}
if [[ $_crashkernel == auto ]] ||
- [[ $_crashkernel == "$_old_default_crashkernel" &&
- $_new_default_crashkernel != "$_old_default_crashkernel" ]]; then
- _update_kernel_arg_in_grub_etc_default crashkernel
"$_new_default_crashkernel"
+ [[ $_crashkernel == "$_old_default_crashkernel" &&
+ $_new_default_crashkernel != "$_old_default_crashkernel" ]]; then
+ _update_kernel_arg_in_grub_etc_default crashkernel
"$_new_default_crashkernel"
fi
}
--
2.37.1