targetcli-fb: 2.1.fb32, remove target service

4 files changed, 9 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eac66741ef03..e468d3794c20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,15 @@
 pkgbase = targetcli-fb
 	pkgdesc = free branch of the targetcli LIO administration shell (iSCSI + Co)
-	pkgver = 2.1.fb31
+	pkgver = 2.1.fb32
 	pkgrel = 1
 	url = https://github.com/agrover/targetcli-fb
 	arch = any
 	license = Apache
-	depends = python-rtslib-fb>=2.1.fb33
+	depends = python-rtslib-fb>=2.1.fb42
 	depends = python-configshell-fb
 	provides = targetcli
-	conflicts = lio-utils
-	source = https://fedorahosted.org/releases/t/a/targetcli-fb/targetcli-fb-2.1.fb31.tar.gz
-	source = target.service
-	source = target
-	md5sums = 12db6c11794fdff7c704107d72720379
-	md5sums = f462e9a5852346c66b77793565ddbc67
-	md5sums = f23bd6d5d4021c29b4519e40b3b9e042
+	source = https://fedorahosted.org/releases/t/a/targetcli-fb/targetcli-fb-2.1.fb32.tar.gz
+	md5sums = 16dc44a858025511b46858b0c5d56151
 
 pkgname = targetcli-fb
 
diff --git a/PKGBUILD b/PKGBUILD
index 1eb428b6b40d..63983bdf81aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=targetcli-fb
-pkgver=2.1.fb31
+pkgver=2.1.fb32
 pkgrel=1
 epoch=
 pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)"
@@ -8,19 +8,15 @@ arch=('any')
 url="https://github.com/agrover/targetcli-fb"
 license=('Apache')
 groups=()
-depends=('python-rtslib-fb>=2.1.fb33' 'python-configshell-fb')
+depends=('python-rtslib-fb>=2.1.fb42' 'python-configshell-fb')
 optdepends=()
-conflicts=('lio-utils')
 provides=('targetcli')
 backup=()
 options=()
 install=
-source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$pkgname-$pkgver.tar.gz
-target.service
-target)
-md5sums=('12db6c11794fdff7c704107d72720379'
-         'f462e9a5852346c66b77793565ddbc67'
-         'f23bd6d5d4021c29b4519e40b3b9e042')
+source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$pkgname-$pkgver.tar.gz)
+md5sums=('16dc44a858025511b46858b0c5d56151')
+
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -33,15 +29,6 @@ package() {
   python setup.py install --skip-build --root="$pkgdir/" --optimize=1
 
   install -D -m 644 targetcli.8.gz "$pkgdir/usr/share/man/man8/targetcli.8.gz"
-
-  # arch specific
-  cd "$srcdir"
-  install -d "$pkgdir/etc/target"
-  # systemd
-  mkdir -p "$pkgdir/usr/lib/systemd/system"
-  cp target.service "$pkgdir/usr/lib/systemd/system/"
-  # sysvinit (deprecated)
-  install -D -m 755 target "$pkgdir/etc/rc.d/target"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/target b/target
deleted file mode 100644
index b4d06acd7001..000000000000
--- a/target
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/bash
-
-daemon_name=target
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		if [ ! -d /sys/kernel/config ]; then
-			stat_busy "Mounting configfs"
-			modprobe configfs
-			mount -t configfs configfs /sys/kernel/config
-			if [ $? != 0 ]; then
-				stat_fail
-				exit 1
-			else
-				stat_done
-			fi
-		fi
-		stat_busy "Starting lio targets"
-		/usr/bin/targetcli restoreconfig clear_existing=true
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-			exit 1
-		else
-      			add_daemon $daemon_name
-			stat_done
-		fi
-		;;
-
-	stop)
-		stat_busy "Stopping lio targets"
-    		/usr/bin/targetcli clearconfig confirm=true
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon $daemon_name
-			stat_done
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 3
-		$0 start
-		;;
-
-	status)
-		stat_busy "Checking status of lio targets";
-		ck_status $daemon_name
-		ck_daemon $daemon_name || /usr/bin/targetcli sessions
-		;;
-
-	*)
-		echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/target.service b/target.service
deleted file mode 100644
index 5fa716e98e64..000000000000
--- a/target.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Restore LIO kernel target configuration
-Requires=sys-kernel-config.mount
-After=sys-kernel-config.mount network.target local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/bin/targetcli restoreconfig clear_existing=true
-ExecStop=/usr/bin/targetcli clearconfig confirm=true
-SyslogIdentifier=target
-
-[Install]
-WantedBy=multi-user.target
-