rpms/iscsi-initiator-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

update iscsi-initiator-utils rpms. Note that this removed the old

Browse Source 
/var/db/iscsi and replaces with /etc/iscsi/nodes and
    /etc/iscsi/send_targets files and the initiatorname and conf files have
    been moved to /etc/iscsi
This commit is contained in:
mchristi 2006-08-31 20:09:46 +00:00
parent cc7fbba22b
commit 3556861c2e
4 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -4,3 +4,4 @@ open-iscsi-5.0.5.595.tar.bz2
open-iscsi-6.0.5.595.tar.bz2 open-iscsi-6.0.5.595.tar.bz2
open-iscsi-1.1-645.tar.bz2 open-iscsi-1.1-645.tar.bz2
open-iscsi-6.1.1.645.tar.bz2 open-iscsi-6.1.1.645.tar.bz2
open-iscsi-6.1.1.685.tar.bz2

23
iscsi-initiator-utils.spec
View File

@ -1,8 +1,8 @@
Summary: iSCSI daemon and utility programs Summary: iSCSI daemon and utility programs
Name: iscsi-initiator-utils Name: iscsi-initiator-utils
Version: 6.1.1.645 Version: 6.1.1.685
Release: 1 Release: 0
Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-%{version}.tar.bz2 Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-6.1.1.685.tar.bz2
Source1: iscsi.init Source1: iscsi.init
Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch Patch0: open-iscsi-5.0.5.595-update-initscripts-and-docs.patch
Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch Patch1: open-iscsi-5.0.5.595-add-iscsi-iname.patch
@ -11,7 +11,7 @@ Group: System Environment/Daemons
License: GPL License: GPL
URL: http://www.open-iscsi.org URL: http://www.open-iscsi.org
Buildroot: %{_tmppath}/%{name}-root Buildroot: %{_tmppath}/%{name}-root
BuildRequires: openssl-devel db4-devel BuildRequires: openssl-devel
Prereq: /sbin/chkconfig Prereq: /sbin/chkconfig
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
@ -35,12 +35,12 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/sbin
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
mkdir -p $RPM_BUILD_ROOT/var/db/iscsi/ mkdir -p $RPM_BUILD_ROOT/etc/iscsi
install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin install -s -m 755 usr/iscsid usr/iscsiadm utils/iscsi-iname usr/iscsistart $RPM_BUILD_ROOT/sbin
install -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8 install -m 644 doc/iscsiadm.8 $RPM_BUILD_ROOT/%{_mandir}/man8
install -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8 install -m 644 doc/iscsid.8 $RPM_BUILD_ROOT/%{_mandir}/man8
#install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi #install -m 755 etc/initd/initd.redhat $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc install -m 644 etc/iscsid.conf $RPM_BUILD_ROOT/etc/iscsi
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
@ -48,8 +48,8 @@ install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/iscsi
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post
if [ ! -f /etc/initiatorname.iscsi ]; then if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then
echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/initiatorname.iscsi echo "InitiatorName=`/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi
fi fi
/sbin/chkconfig --add iscsi /sbin/chkconfig --add iscsi
@ -62,12 +62,15 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%doc README %doc README
%config /etc/rc.d/init.d/iscsi %config /etc/rc.d/init.d/iscsi
%attr(0600,root,root) %config(noreplace) /etc/iscsid.conf %attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf
%dir /var/db/iscsi
/sbin/* /sbin/*
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Mon Aug 28 2006 Mike Christie <mchristie@redhat.com> - 6.1.1.685
- Rebase to upstream to bring in many bug fixes and rm db.
- iscsi uses /etc/iscsi instead of just etc now
* Fri Jul 21 2006 Jeremy Katz <katzj@redhat.com> - 6.1.1.645-1 * Fri Jul 21 2006 Jeremy Katz <katzj@redhat.com> - 6.1.1.645-1
- fix shutdown with root on iscsi - fix shutdown with root on iscsi

16
iscsi.init
View File

@ -4,8 +4,8 @@
# description: Starts and stops the iSCSI initiator # description: Starts and stops the iSCSI initiator
# #
# processname: iscsid # processname: iscsid
# pidfile: /var/run/iscsid.pid # pidfile: /etc/iscsi/iscsid.pid
# config: /etc/iscsid.conf # config: /etc/iscsi/iscsid.conf
# Source function library. # Source function library.
. /etc/init.d/functions . /etc/init.d/functions
@ -26,11 +26,13 @@ start()
touch /var/lock/subsys/iscsi touch /var/lock/subsys/iscsi
echo -n $"Setting up iSCSI targets: " echo -n $"Setting up iSCSI targets: "
TARGETS=`iscsiadm -m node 2> /dev/null | sed 's@\[\(.*\)\] .*@\1@g'` TARGETS=`iscsiadm -m node 2>/dev/null | sed 's/ /@/g'`
for rec in $TARGETS; do for node in $TARGETS; do
STARTUP=`iscsiadm -m node -r $rec | grep "node.startup" | cut -d' ' -f3` target=`echo $node | cut -d@ -f2`
if [ $STARTUP = "automatic" ]; then port=`echo $node | cut -d@ -f1`
iscsiadm -m node -r $rec -l STARTUP=`iscsiadm -m node -T $target -p $port | grep "node.conn\[0\].startup" | cut -d' ' -f3`
if [ "$STARTUP" = "automatic" ]; then
iscsiadm -m node -T $target -p $port -l
fi fi
done done
success success

2
sources
View File

@ -1 +1 @@
46938978c78168de917f73f9e53c9425 open-iscsi-6.1.1.645.tar.bz2 89a822f2b1a06884f915e6512df3a384 open-iscsi-6.1.1.685.tar.bz2