mv pid file and change default iscsi initiator name
This commit is contained in:
parent
cd17de22ed
commit
ec0a7314a4
11
iscsi-initiator-utils-use-var-for-pid.patch
Normal file
11
iscsi-initiator-utils-use-var-for-pid.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- open-iscsi-6.2.0.695/usr/initiator.h 2006-09-06 03:16:07.000000000 -0400
|
||||||
|
+++ open-iscsi-6.2.0.695.work/usr/initiator.h 2006-09-26 18:49:59.000000000 -0400
|
||||||
|
@@ -34,7 +34,7 @@
|
||||||
|
#define ST_CONFIG_DIR "/etc/iscsi/send_targets"
|
||||||
|
#define NODE_CONFIG_DIR "/etc/iscsi/nodes"
|
||||||
|
#define CONFIG_FILE "/etc/iscsi/iscsid.conf"
|
||||||
|
-#define PID_FILE "/etc/iscsi/iscsid.pid"
|
||||||
|
+#define PID_FILE "/var/run/iscsid.pid"
|
||||||
|
#define INITIATOR_NAME_FILE "/etc/iscsi/initiatorname.iscsi"
|
||||||
|
#define LOCK_FILE "/etc/iscsi/lock"
|
||||||
|
#define LOCK_WRITE_FILE "/etc/iscsi/lock.write"
|
@ -1,12 +1,13 @@
|
|||||||
Summary: iSCSI daemon and utility programs
|
Summary: iSCSI daemon and utility programs
|
||||||
Name: iscsi-initiator-utils
|
Name: iscsi-initiator-utils
|
||||||
Version: 6.2.0.695
|
Version: 6.2.0.695
|
||||||
Release: 0.1
|
Release: 0.2
|
||||||
Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-6.2.0.695.tar.bz2
|
Source0: http://people.redhat.com/mchristi/iscsi/FC6/open-iscsi/rpm/open-iscsi-6.2.0.695.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
|
||||||
Patch2: iscsi-initiator-utils-fix-session-mixup-on-restart.patch
|
Patch2: iscsi-initiator-utils-fix-session-mixup-on-restart.patch
|
||||||
|
Patch3: iscsi-initiator-utils-use-var-for-pid.patch
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
License: GPL
|
License: GPL
|
||||||
@ -27,6 +28,7 @@ Protocol networks.
|
|||||||
%patch0 -p1 -b .update-initscripts-and-docs
|
%patch0 -p1 -b .update-initscripts-and-docs
|
||||||
%patch1 -p1 -b .add-iscsi-iname
|
%patch1 -p1 -b .add-iscsi-iname
|
||||||
%patch2 -p1 -b .fix-session-mixup-on-restart
|
%patch2 -p1 -b .fix-session-mixup-on-restart
|
||||||
|
%patch3 -p1 -b .use-var-for-pid
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make OPTFLAGS="%{optflags}" -C usr
|
make OPTFLAGS="%{optflags}" -C usr
|
||||||
@ -69,6 +71,10 @@ fi
|
|||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
*Tue Sep 26 2006 Mike Christie <mchristie@redhat.com> - 6.2.0.695-0.2
|
||||||
|
- BZ 208050 - change default initiator name to reflect redhat
|
||||||
|
- Move pid from /etc/iscsi to /var/run/iscsid.pid
|
||||||
|
|
||||||
* Fri Sep 15 2006 Mike Christie <mchristie@redhat.com> - 6.2.0.695-0.1
|
* Fri Sep 15 2006 Mike Christie <mchristie@redhat.com> - 6.2.0.695-0.1
|
||||||
- Add compat with FC kernel so iscsid will pass startup checks and run.
|
- Add compat with FC kernel so iscsid will pass startup checks and run.
|
||||||
- Fix bug when using hw iscsi and software iscsi and iscsid is restarted.
|
- Fix bug when using hw iscsi and software iscsi and iscsid is restarted.
|
||||||
|
@ -95,7 +95,7 @@ diff -Naurp open-iscsi/utils/iscsi-iname.c open-iscsi.work/utils/iscsi-iname.c
|
|||||||
+ exit(0);
|
+ exit(0);
|
||||||
+ }
|
+ }
|
||||||
+ } else {
|
+ } else {
|
||||||
+ prefix = "iqn.2005-03.com.max:01";
|
+ prefix = "iqn.2005-03.com.redhat";
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /* try to feed some entropy from the pool to MD5 in order to get
|
+ /* try to feed some entropy from the pool to MD5 in order to get
|
||||||
|
@ -95,7 +95,7 @@ diff -Naurp open-iscsi/utils/iscsi-iname.c open-iscsi-5.0.5.595/utils/iscsi-inam
|
|||||||
+ exit(0);
|
+ exit(0);
|
||||||
+ }
|
+ }
|
||||||
+ } else {
|
+ } else {
|
||||||
+ prefix = "iqn.2005-03.com.max:01";
|
+ prefix = "iqn.2005-03.com.redhat";
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /* try to feed some entropy from the pool to MD5 in order to get
|
+ /* try to feed some entropy from the pool to MD5 in order to get
|
||||||
|
Loading…
Reference in New Issue
Block a user