Attachment 730869 Details for Bug 923199 – change init and continuation.py to use hwcert-backend continue --mode auto

[patch] change init and continuation.py to use hwcert-backend continue --mode auto

0001-923199-1.5-kdump-reboot-fills-console-output-asking-.patch (text/plain), 4.78 KB, created by Greg Nichols on 2013-04-02 17:25:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2013-04-02 17:25:22 UTC

Size: 4.78 KB

patch

obsolete

>From 501a583c8f4a9338dfbe7a73051067e470ed9c14 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Tue, 2 Apr 2013 13:22:30 -0400
>Subject: [PATCH] 923199 - [1.5] kdump reboot fills console output asking for
> deleting results confirmation
>
>---
> Makefile                     |  2 +-
> hwcert-client.spec.in        |  4 +++
> hwcert/continuation.py       |  4 +--
> test-env/init/Makefile       |  4 +--
> test-env/init/hwcert         | 61 --------------------------------------------
> test-env/init/hwcert-backend | 61 ++++++++++++++++++++++++++++++++++++++++++++
> 6 files changed, 70 insertions(+), 66 deletions(-)
> delete mode 100755 test-env/init/hwcert
> create mode 100755 test-env/init/hwcert-backend
>
>diff --git a/Makefile b/Makefile
>index aaee99c..d0d5cbb 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -14,7 +14,7 @@
> # Author: Greg Nichols
> 
> HWCERT_VERSION := 1.5.9
>-HWCERT_RELEASE := 19
>+HWCERT_RELEASE := 20
> HWCERT_VERSION_RELEASE := $(HWCERT_VERSION)-$(HWCERT_RELEASE)
> HWCERT_VERSION_PY := hwcert/version.py
> HWCERT_RHEL_VERSION := 5
>diff --git a/hwcert-client.spec.in b/hwcert-client.spec.in
>index 0ffe47a..f48f241 100644
>--- a/hwcert-client.spec.in
>+++ b/hwcert-client.spec.in
>@@ -78,6 +78,10 @@ DESTDIR=$RPM_BUILD_ROOT make HWCERT_RHEL_VERSION=%{rhel_version} install
> %changelog
> * Tue Apr 02 2013 Greg Nichols <gnichols@redhat.com>
> 
>+hwcert-client 1.5.9 R20
>+
>+  923199 - [1.5] kdump reboot fills console output asking for deleting results confirmation
>+
> hwcert-client 1.5.9 R18
> 
>   918741 - [1.5] FEAT: ship kernelinfo.xml in it's own package
>diff --git a/hwcert/continuation.py b/hwcert/continuation.py
>index e16d715..0ba06c5 100644
>--- a/hwcert/continuation.py
>+++ b/hwcert/continuation.py
>@@ -40,7 +40,7 @@ class Continuation(Controller):
>     def setInitConfig(self, marker, method=None):
>         if method:
>             self.method = method
>-        chkconfig = Command("chkconfig --add hwcert")
>+        chkconfig = Command("chkconfig --add hwcert-backend")
>         chkconfig.echo()
>         # get a timestamo, save it
>         theTime = time.localtime(time.time())
>@@ -57,7 +57,7 @@ class Continuation(Controller):
>         syslog.syslog(self.getSystemLogMarker(markerName, "begin", pid=False))
>         
>     def removeInitConfig(self):
>-        chkconfig = Command("chkconfig --del hwcert")
>+        chkconfig = Command("chkconfig --del hwcert-backend")
>         chkconfig.echo()
>         
>     def isInitialized(self):
>diff --git a/test-env/init/Makefile b/test-env/init/Makefile
>index 3b0391b..39df267 100644
>--- a/test-env/init/Makefile
>+++ b/test-env/init/Makefile
>@@ -15,7 +15,7 @@
> .PHONY: clean
> 
> 
>-FILES := hwcert 
>+FILES := hwcert-backend
> 
> all install:
> 	mkdir -p $(DESTDIR)/etc/init.d
>@@ -23,4 +23,4 @@ all install:
> 
> clean:
> 	for file in $(FILES); do rm -f $(DESTDIR)/etc/init.d/$$file; done
>-	
>\ No newline at end of file
>+	
>diff --git a/test-env/init/hwcert b/test-env/init/hwcert
>deleted file mode 100755
>index c8bbc6b..0000000
>--- a/test-env/init/hwcert
>+++ /dev/null
>@@ -1,61 +0,0 @@
>-#!/bin/sh
>-#
>-# hwcert: Red Hat Hardware Test Suite
>-#
>-# chkconfig: 2345 35 98
>-# description: Red Hat Hardware Test Suite
>-
>-. /etc/rc.d/init.d/functions
>-RETVAL=0
>-HWCERT=/usr/bin
>-
>-start() {
>-    $HWCERT/hwcert continue  --mode auto &
>-}
>-
>-stop() {
>-	killall hwcert
>-}
>-
>-reload() {
>-	stop
>-	start
>-}
>-
>-hwcert_status() {
>-	if ps ax | fgrep hwcert &>/dev/null; then 
>-		echo $"hwcert is running"
>-		return 0
>-	else
>-		echo $"hwcert is not running"
>-		return 3
>-	fi
>-}
>-
>-case "$1" in
>-	start)
>-		start
>-		;;
>-	stop)
>-		stop
>-		;;
>-	status)
>-		hwcert_status
>-		RETVAL=$?
>-		;;
>-	restart)
>-		stop
>-		start
>-		;;
>-	condrestart)
>-		if qemu_status &>/dev/null; then
>-			stop
>-			start
>-		fi
>-		;;
>-	*)
>-		echo $"Usage: $prog {start|stop|status|restart|condrestart}"
>-		exit 1
>-esac
>-exit $RETVAL
>-
>diff --git a/test-env/init/hwcert-backend b/test-env/init/hwcert-backend
>new file mode 100755
>index 0000000..c799b53
>--- /dev/null
>+++ b/test-env/init/hwcert-backend
>@@ -0,0 +1,61 @@
>+#!/bin/sh
>+#
>+# hwcert-backend: Red Hat Hardware Test Suite
>+#
>+# chkconfig: 2345 35 98
>+# description: Red Hat Hardware Test Suite
>+
>+. /etc/rc.d/init.d/functions
>+RETVAL=0
>+HWCERT=/usr/bin
>+
>+start() {
>+    $HWCERT/hwcert-backend continue  --mode auto &
>+}
>+
>+stop() {
>+	killall hwcert-backend
>+}
>+
>+reload() {
>+	stop
>+	start
>+}
>+
>+hwcert_status() {
>+	if ps ax | fgrep hwcert-backend &>/dev/null; then 
>+		echo $"hwcert-backend is running"
>+		return 0
>+	else
>+		echo $"hwcert-backend is not running"
>+		return 3
>+	fi
>+}
>+
>+case "$1" in
>+	start)
>+		start
>+		;;
>+	stop)
>+		stop
>+		;;
>+	status)
>+		hwcert_status
>+		RETVAL=$?
>+		;;
>+	restart)
>+		stop
>+		start
>+		;;
>+	condrestart)
>+		if hwcert_status &>/dev/null; then
>+			stop
>+			start
>+		fi
>+		;;
>+	*)
>+		echo $"Usage: $prog {start|stop|status|restart|condrestart}"
>+		exit 1
>+esac
>+exit $RETVAL
>+
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 923199: 730869