Attachment 590338 Details for Bug 815664 – proposed patch

[patch] proposed patch

kdumpctl-status-print.patch (text/plain), 2.57 KB, created by Dave Young on 2012-06-08 05:52:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Young

Created: 2012-06-08 05:52:06 UTC

Size: 2.57 KB

patch

obsolete

>
>Resolves: bz815664
>
>systemd service start/stop does not print out anything.
>One need use systemctl status to check the service status.
>
>When testing kdump service we need often to manually call kdumpctl
>For convenient of this use here add the status printing back.
>
>Signed-off-by: Dave Young <dyoung@redhat.com>
>---
> kdumpctl |   23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
>--- kexec-tools.orig/kdumpctl
>+++ kexec-tools/kdumpctl
>@@ -22,6 +22,8 @@ if [ -f /etc/sysconfig/kdump ]; then
> 	. /etc/sysconfig/kdump
> fi
> 
>+. /etc/init.d/functions
>+
> function save_core()
> {
> 	coredir="/var/crash/`date +"%Y-%m-%d-%H:%M"`"
>@@ -321,13 +323,13 @@ function start()
> 	local nr
> 	nr=$(awk 'BEGIN{cnt=0} /^raw|^net|^ext[234]|^xfs|^btrfs|^minix/{cnt++} END{print cnt}' $KDUMP_CONFIG_FILE)
> 	[ $nr -gt 1 ] && {
>-		echo -n "Error: More than one dump targets specified"; echo
>+		echo -n "Error: More than one dump targets specified"; failure; echo
> 		return 1
> 	}
> 
> 	save_raw
> 	if [ $? -ne 0 ]; then
>-		echo -n "Starting kdump:"; echo
>+		echo -n "Starting kdump:"; failure; echo
> 		$LOGGER "failed to start up"
> 		return 1
> 	fi
>@@ -335,11 +337,11 @@ function start()
> 	status 
> 	rc=$?
> 	if [ $rc == 2 ]; then
>-		echo -n "Kdump is not supported on this kernel"; echo
>+		echo -n "Kdump is not supported on this kernel"; failure; echo
> 		return 1;
> 	else
> 		if [ $rc == 0 ]; then
>-			echo -n "Kdump already running";  echo
>+			echo -n "Kdump already running"; success; echo
> 			return 0
> 		fi
> 	fi
>@@ -348,18 +350,18 @@ function start()
> 
> 	check_config
> 	if [ $? != 0 ]; then
>-		echo -n "Starting kdump:"; echo
>+		echo -n "Starting kdump:"; failure; echo
> 		$LOGGER "failed to start up, config file incorrect"
> 		return 1
> 	fi
> 	load_kdump
> 	if [ $? != 0 ]; then
>-		echo -n "Starting kdump:"; echo
>+		echo -n "Starting kdump:"; failure; echo
> 		$LOGGER "failed to start up"
> 		return 1
> 	fi
> 
>-	echo -n "Starting kdump:";  echo
>+	echo -n "Starting kdump:"; success; echo
> 	$LOGGER "started up"
> }
> 
>@@ -368,19 +370,20 @@ function stop()
> 	$KEXEC -p -u 2>/dev/null
> 	if [ $? == 0 ]; then
> 		$LOGGER "kexec: unloaded kdump kernel"
>-		echo -n "Stopping kdump:";  echo
>+		echo -n "Stopping kdump:"; success; echo
> 		$LOGGER "stopped"
> 		return 0
> 	else
> 		$LOGGER "kexec: failed to unload kdump kernel"
>-		echo -n "Stopping kdump:"; echo
>+		echo -n "Stopping kdump:"; failure; echo
> 		$LOGGER "failed to stop"
> 		return 1
> 	fi
> }
> 
> if [ ! -f "$KDUMP_CONFIG_FILE" ]; then
>-	echo -n "No kdump config file found!"; echo
>+	echo -n "kdump service $1:" failure; echo
>+	$LOGGER -n "No kdump config file found!";
> 	exit 1
> fi
>

Actions: View | Diff

Attachments on bug 815664: 590338