Remove blktapctl scripts

Not included anymore

Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>

diff --git a/SOURCES/blktapctrl.service b/SOURCES/blktapctrl.service
deleted file mode 100644 (file)
index b5c7c2c..0000000
--- a/SOURCES/blktapctrl.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=blktapctrl daemon
-Requires=proc-xen.mount
-After=proc-xen.mount
-RefuseManualStop=true
-ConditionPathExists=/proc/xen
-
-[Service]
-Type=forking
-Environment=BLKTAPCTRL_ARGS=
-EnvironmentFile=-/etc/sysconfig/blktapctrl
-ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/blktapctrl $BLKTAPCTRL_ARGS
-
-[Install]
-WantedBy=multi-user.target

diff --git a/SOURCES/init.blktapctrl b/SOURCES/init.blktapctrl
deleted file mode 100755 (executable)
index b331013..0000000
--- a/SOURCES/init.blktapctrl
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#
-# blktapctrl   Script to start the Xen blktapctrl daemon
-#
-# Author:       Daniel Berrange <berrange@redhat.com>
-#
-# chkconfig: 2345 97 02
-# description: Starts and stops the Xen blktapctrl daemon.
-### BEGIN INIT INFO
-# Provides:          blktapctrl
-# Required-Start:    $syslog $remote_fs
-# Should-Start:
-# Required-Stop:     $syslog $remote_fs
-# Should-Stop:
-# Default-Start:     3 4 5
-# Default-Stop:      0 1 2 6
-# Default-Enabled:   yes
-# Short-Description: Start/stop blktapctrl
-# Description:       Starts and stops the Xen blktapctrl daemon
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-if [ ! -d /proc/xen ]; then
-       exit 0
-fi
-if ! grep -q "control_d" /proc/xen/capabilities ; then
-       exit 0
-fi
-
-# Default config params
-BLKTAPCTRL_ARGS=
-
-# User customized params
-test -f /etc/sysconfig/blktapctrl && . /etc/sysconfig/blktapctrl
-
-start() {
-       echo -n $"Starting xen blktapctrl daemon: "
-        /usr/sbin/blktapctrl $BLKTAPCTRL_ARGS
-       RETVAL=$?
-       test $RETVAL = 0 && echo_success || echo_failure
-        echo
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/blktapctrl
-}
-
-stop() {
-       echo -n $"Stoping xen blktapctrl daemon: "
-       # blktapctrl is not restartable.  So we refuse to stop it
-       # unless the machine is being shutdown or rebooted anyway.
-       if test "$runlevel" = "0" -o "$runlevel" = "6"; then
-               killproc xenstored > /dev/null
-               RETVAL=$?
-       else
-               RETVAL=1
-       fi
-       test $RETVAL = 0 && echo_success || echo_failure
-        echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/blktapctrl
-}
-
-rcstatus() {
-        status blktapctrl
-        RETVAL=$?
-       test $RETVAL = 0 && echo_success || echo_failure
-       echo
-}
-
-
-RETVAL=0
-case "$1" in
-  start)
-        start
-       ;;
-  stop)
-        stop
-       ;;
-  status)
-        rcstatus
-       ;;
-  *)
-       echo $"Usage: $0 {start|stop|status}"
-       exit 1
-esac
-
-exit $RETVAL
-

diff --git a/SOURCES/sysconfig.blktapctrl b/SOURCES/sysconfig.blktapctrl
deleted file mode 100755 (executable)
index bb6c09d..0000000
--- a/SOURCES/sysconfig.blktapctrl
+++ /dev/null
@@ -1 +0,0 @@
-#BLKTAPCTRL_ARGS=

diff --git a/SPECS/xen.spec b/SPECS/xen.spec
index ea05f01302e0e8f0d0624b26c0f789ed93f4f7af..f007c71958a83b21c58a14336e8d69fcef525e55 100644 (file)
--- a/SPECS/xen.spec
+++ b/SPECS/xen.spec
@@ -36,18 +36,15 @@ Source15: polarssl-1.1.4-gpl.tgz
 # init.d bits
 Source20: init.xenstored
 Source21: init.xenconsoled
-Source22: init.blktapctrl
 Source23: init.xend
 # sysconfig bits
 Source30: sysconfig.xenstored
 Source31: sysconfig.xenconsoled
-Source32: sysconfig.blktapctrl
 Source33: sysconfig.xend
 # systemd bits
 Source40: proc-xen.mount
 Source41: var-lib-xenstored.mount
 Source42: xenstored.service
-Source43: blktapctrl.service
 Source44: xend.service
 Source45: xenconsoled.service
 Source46: xen-watchdog.service
@@ -356,7 +353,6 @@ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 %if %with_sysv
 install -m 755 %{SOURCE20} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenstored
 install -m 755 %{SOURCE21} %{buildroot}%{_sysconfdir}/rc.d/init.d/xenconsoled
-install -m 755 %{SOURCE22} %{buildroot}%{_sysconfdir}/rc.d/init.d/blktapctrl
 install -m 755 %{SOURCE23} %{buildroot}%{_sysconfdir}/rc.d/init.d/xend
 %else
 rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xen-watchdog
@@ -369,7 +365,6 @@ rm %{buildroot}%{_sysconfdir}/rc.d/init.d/xendomains
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644 %{SOURCE30} %{buildroot}%{_sysconfdir}/sysconfig/xenstored
 install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled
-install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl
 
 # systemd
 %if %with_systemd
@@ -377,7 +372,6 @@ mkdir -p %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE40} %{buildroot}%{_unitdir}/proc-xen.mount
 install -m 644 %{SOURCE41} %{buildroot}%{_unitdir}/var-lib-xenstored.mount
 install -m 644 %{SOURCE42} %{buildroot}%{_unitdir}/xenstored.service
-install -m 644 %{SOURCE43} %{buildroot}%{_unitdir}/blktapctrl.service
 install -m 644 %{SOURCE44} %{buildroot}%{_unitdir}/xend.service
 install -m 644 %{SOURCE45} %{buildroot}%{_unitdir}/xenconsoled.service
 install -m 644 %{SOURCE46} %{buildroot}%{_unitdir}/xen-watchdog.service
@@ -466,7 +460,6 @@ fi
 /sbin/chkconfig --add xenconsoled
 /sbin/chkconfig --add xenstored
 /sbin/chkconfig --add xencommons
-/sbin/chkconfig --add blktapctrl
 %endif
 %if %with_systemd
 /bin/systemctl enable xenstored.service
@@ -486,7 +479,6 @@ if [ $1 = 0 ]; then
   /sbin/chkconfig --del xenconsoled
   /sbin/chkconfig --del xenstored
   /sbin/chkconfig --del xencommons
-  /sbin/chkconfig --del blktapctrl
 %endif
 %if %with_systemd
   /bin/systemctl disable xenstored.service
@@ -571,7 +563,6 @@ rm -rf %{buildroot}
 %config %attr(0700,root,root) %{_sysconfdir}/%{name}/scripts/*
 
 %if %with_sysv
-%{_sysconfdir}/rc.d/init.d/blktapctrl
 %{_sysconfdir}/rc.d/init.d/xenstored
 %{_sysconfdir}/rc.d/init.d/xenconsoled
 %{_sysconfdir}/rc.d/init.d/xen-watchdog
@@ -583,7 +574,6 @@ rm -rf %{buildroot}
 %{_unitdir}/proc-xen.mount
 %{_unitdir}/var-lib-xenstored.mount
 %{_unitdir}/xenstored.service
-%{_unitdir}/blktapctrl.service
 %{_unitdir}/xenconsoled.service
 %{_unitdir}/xen-watchdog.service
 /usr/lib/tmpfiles.d/xen.conf
@@ -591,7 +581,6 @@ rm -rf %{buildroot}
 
 %config(noreplace) %{_sysconfdir}/sysconfig/xenstored
 %config(noreplace) %{_sysconfdir}/sysconfig/xenconsoled
-%config(noreplace) %{_sysconfdir}/sysconfig/blktapctrl
 %config(noreplace) %{_sysconfdir}/sysconfig/xencommons
 %config(noreplace) %{_sysconfdir}/xen/xl.conf
 %config(noreplace) %{_sysconfdir}/xen/cpupool
@@ -771,6 +760,7 @@ rm -rf %{buildroot}
  - Backported fixes to use tapdisk with HVM guests
  - Backported XSAs 107,109-114
  - Backported fixes to migration, cpupools
+ - Remove blktapctl initscripts as it\'s no longer available in 4.4
 
 * Wed Oct 22 2014 George Dunlap <george.dunlap@eu.citrix.com> - 4.4.1-2.el6.centos
  - Updated to blktap 2.5 v0.9.2