Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=20acb553376ce920e90a938e0ce334409f7b8a75
commit 20acb553376ce920e90a938e0ce334409f7b8a75 Author: Miklos Vajna <[email protected]> Date: Tue Jan 1 17:16:02 2013 +0100 iscsi-2.0_873-2-x86_64 - drop sysv support diff --git a/source/network-extra/iscsi/FrugalBuild b/source/network-extra/iscsi/FrugalBuild index 0f6199a..a5169be 100644 --- a/source/network-extra/iscsi/FrugalBuild +++ b/source/network-extra/iscsi/FrugalBuild @@ -4,24 +4,22 @@ pkgname=iscsi _F_archive_name="open-iscsi" pkgver=2.0_873 -pkgrel=1 +pkgrel=2 pkgdesc="Open-iSCSI project is a high performance, transport independent" url="http://www.open-iscsi.org"; #don't build modules provides by kernel now source=(http://www.open-iscsi.org/bits/$_F_archive_name-${pkgver/_/-}.tar.gz \ - initiatorname.iscsi rc.iscsid iscsid iscsid.service) + initiatorname.iscsi iscsid iscsid.service) up2date="Flasttar http://www.open-iscsi.org/bits/"; depends=('glibc') groups=('network-extra') archs=('i686' 'x86_64') sha1sums=('d72c00d5bad16a2d8c77811441b50ac527af57d9' \ '7adb8bb034125184c7210d12c6c562069539545a' \ - '2d8e99f24ec87b923a76af06404567f7cfeb33a5' \ '39125cc84c75f9ada1e1a8ed0d412b384ead6d63' \ 'e35565aed06ce39126bd39dbb87eb474d7505865') _F_cd_path=$_F_archive_name-${pkgver/_/-} backup=('etc/iscsi/iscsid.conf' 'etc/iscsi/initiatorname.iscsi' 'etc/sysconfig/iscsid') -_F_sysvinit_units=(iscsid) _F_systemd_units=(iscsid=) Finclude systemd @@ -32,7 +30,6 @@ build() { Fdirschmod var/db/iscsi 0700 Fcp initiatorname.iscsi etc/iscsi/ Fcp iscsid etc/sysconfig/ - Frcd2 iscsid Ffile /lib/systemd/system/iscsid.service Fgenscriptlet } diff --git a/source/network-extra/iscsi/rc.iscsid b/source/network-extra/iscsi/rc.iscsid deleted file mode 100644 index c603410..0000000 --- a/source/network-extra/iscsi/rc.iscsid +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash - -# (c) 2009 bouleetbil <[email protected]> -# rc.iscsi for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 85 15 -# description: Open-iSCSI is a high performance, transport independent. - -source /lib/initscripts/functions -TEXTDOMAIN=iscsid -TEXTDOMAINDIR=/lib/initscripts/messages -daemon="iscsid" - -actions=(restart start status stop) - -[ -e /etc/sysconfig/iscsid ] && . /etc/sysconfig/iscsid -pid="pidof iscsid 2> /dev/null" - -do_modules() { - msg="$1" - shift - modules="${1}" - shift - modopts="$@" - for m in ${modules} - do - if [ -n "$(modprobe -l | grep ${m})" ] - then - modprobe ${modopts} ${m} - fi - done -} - -rc_start() -{ - start_msg - if [ -z "$(eval $pid)" ]; then - do_modules 'Loading' 'libiscsi scsi_transport_iscsi iscsi_tcp' - - /sbin/iscsid -- ${OPTS} - - # Start automatic targets when iscsid is started - if [ "${AUTOSTARTTARGETS}" = "yes" ]; then - starttargets - fi - ok $? - else - ok 999 - fi -} - -rc_stop() { - stop_msg - if [ ! -z "$(eval $pid)" ] ;then - stoptargets - killall /sbin/iscsid #--pidfile $PID_FILE - rm -f $PID_FILE - do_modules 'Removing iSCSI modules' 'iscsi_tcp scsi_transport_iscsi libiscsi' '-r' - ok $? - else - ok 999 - fi -} - -starttargets() { - echo "Setting up iSCSI targets" - /sbin/iscsiadm -m node --loginall=automatic -} - -stoptargets() { - echo "Disconnecting iSCSI targets" - sync - /sbin/iscsiadm -m node --logoutall=all -} - -rc_status() { - ebegin "Showing current active iSCSI sessions" - /sbin/iscsiadm -m session -} - -rc_exec $1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
