[Ovirt-devel] From: Alan Pevec <apevec at redhat.com>

[Alan Pevec]

Signed-off-by: Alan Pevec <apevec at redhat.com>
---
 wui/conf/ovirt-host-keyadd |   49 --------------------------------------------
 wui/ovirt-wui.spec         |    5 +++-
 2 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100755 wui/conf/ovirt-host-keyadd

diff --git a/wui/conf/ovirt-host-keyadd b/wui/conf/ovirt-host-keyadd
deleted file mode 100755
index 836288e..0000000
--- a/wui/conf/ovirt-host-keyadd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#
-#
-# ovirt-host-keyadd       startup script for ovirt-host-keyadd
-#
-# chkconfig: - 97 03
-# description:  ovirt-host-keyadd is an essential component of the \
-#    ovirt VM manager.
-#
-
-DAEMON=/usr/share/ovirt-wui/host-keyadd/host-keyadd.rb
-
-. /etc/init.d/functions
-
-start() {
-    echo -n "Starting ovirt-host-keyadd: "
-    daemon $DAEMON
-    RETVAL=$?
-    echo
-}
-
-stop() {
-    echo -n "Shutting down ovirt-host-keyadd: "
-    killproc host-keyadd.rb
-    RETVAL=$?
-    echo
-}
-
-case "$1" in
-    start)
-	start
-	;;
-    stop)
-	stop
-	;;
-    restart)
-	stop
-	start
-	;;
-    status)
-	status $DAEMON
-	RETVAL=$?
-	;;
-    *)
-      echo "Usage: ovirt-host-keyadd {start|stop|restart|status}"
-      exit 1
-  ;;
-esac
-exit $RETVAL
diff --git a/wui/ovirt-wui.spec b/wui/ovirt-wui.spec
index cdc7836..74613f1 100644
--- a/wui/ovirt-wui.spec
+++ b/wui/ovirt-wui.spec
@@ -116,11 +116,14 @@ rm -rf $RPM_BUILD_ROOT
     -s /sbin/nologin -r -d /var/ovirt ovirt 2> /dev/null || :
 
 %post
-#removes legacy ovirt-wui script if present
+#removes obsolete services if present
 if [ -e %{_initrddir}/ovirt-wui ] ; then
   /sbin/service ovirt-wui stop > /dev/null 2>&1
+  /sbin/service ovirt-host-keyadd stop > /dev/null 2>&1
   /sbin/chkconfig --del ovirt-wui
+  /sbin/chkconfig --del ovirt-host-keyadd
   %{__rm} %{_initrddir}/ovirt-wui
+  %{__rm} %{_initrddir}/ovirt-host-keyadd
 fi
 
 exit 0
-- 
1.5.4.1