Compare commits
5 Commits
imports/c8
...
c8
Author | SHA1 | Date |
---|---|---|
eabdullin | 61711c4abe | |
CentOS Sources | 34f917f70d | |
CentOS Sources | a358cb3285 | |
CentOS Sources | 4fb9234324 | |
CentOS Sources | 2c8f73dafe |
|
@ -1 +1 @@
|
|||
SOURCES/open-iscsi-f71581b.tar.gz
|
||||
SOURCES/open-iscsi-095f59c.tar.gz
|
||||
|
|
|
@ -1 +1 @@
|
|||
3d3234035cc7884aa512161e06be6737ade52077 SOURCES/open-iscsi-f71581b.tar.gz
|
||||
d6947b76f161a0adcc6d984ed43a82c99e319578 SOURCES/open-iscsi-095f59c.tar.gz
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
From aeca36572c02a8bf314037d82c4a2625636b175a Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Mon, 3 Jun 2019 14:36:48 -0700
|
||||
Subject: [PATCH] fix iscsiuio build with libsystemd
|
||||
|
||||
---
|
||||
iscsiuio/configure.ac | 2 ++
|
||||
iscsiuio/src/unix/Makefile.am | 6 ++++--
|
||||
2 files changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
|
||||
index ae23078..6138e0e 100644
|
||||
--- a/iscsiuio/configure.ac
|
||||
+++ b/iscsiuio/configure.ac
|
||||
@@ -73,6 +73,8 @@ AC_CONFIG_COMMANDS([default],[[
|
||||
echo 'char *build_date;'> src/unix/build_date.h
|
||||
]],[[]])
|
||||
|
||||
+PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd])
|
||||
+
|
||||
AC_PREFIX_DEFAULT()
|
||||
|
||||
AC_OUTPUT([Makefile
|
||||
diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am
|
||||
index a989ef0..ea5f59e 100644
|
||||
--- a/iscsiuio/src/unix/Makefile.am
|
||||
+++ b/iscsiuio/src/unix/Makefile.am
|
||||
@@ -25,7 +25,8 @@ iscsiuio_SOURCES = build_date.c \
|
||||
|
||||
iscsiuio_CFLAGS = $(AM_CFLAGS) \
|
||||
$(LIBNL_CFLAGS) \
|
||||
- -DBYTE_ORDER=@ENDIAN@
|
||||
+ -DBYTE_ORDER=@ENDIAN@ \
|
||||
+ $(LIBSYSTEMD_CFLAGS)
|
||||
|
||||
iscsiuio_LDFLAGS= $(AM_LDADD) \
|
||||
-ldl \
|
||||
@@ -36,6 +37,7 @@ iscsiuio_LDFLAGS= $(AM_LDADD) \
|
||||
iscsiuio_LDADD = ${top_srcdir}/src/uip/lib_iscsi_uip.a \
|
||||
${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\
|
||||
${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a \
|
||||
- ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a
|
||||
+ ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a \
|
||||
+ $(LIBSYSTEMD_LIBS)
|
||||
|
||||
iscsiuio_YFLAGS = -d
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -1,24 +1,26 @@
|
|||
From efba620a01a2c2fa57b672bced47e88f25078b00 Mon Sep 17 00:00:00 2001
|
||||
From 28e3ef5c630b8433eaad176a53c98af05a994f36 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Tue, 4 Jun 2019 13:23:32 -0700
|
||||
Subject: [PATCH] service file tweaks
|
||||
Subject: [PATCH 01/23] unit file tweaks
|
||||
|
||||
---
|
||||
etc/systemd/iscsi-mark-root-nodes | 30 ++++++++++++++++++++++++++++++
|
||||
etc/systemd/iscsi-shutdown.service | 14 ++++++++++++++
|
||||
etc/systemd/iscsi.service | 23 +++++++++++++----------
|
||||
etc/systemd/iscsid.service | 6 ++++--
|
||||
etc/systemd/iscsiuio.service | 2 +-
|
||||
5 files changed, 62 insertions(+), 13 deletions(-)
|
||||
etc/systemd/iscsi-mark-root-nodes | 34 ++++++++++++++++++++++++++++++
|
||||
etc/systemd/iscsi-onboot.service | 15 +++++++++++++
|
||||
etc/systemd/iscsi-shutdown.service | 15 +++++++++++++
|
||||
etc/systemd/iscsi.service | 16 +++++++-------
|
||||
etc/systemd/iscsid.service | 6 ++----
|
||||
etc/systemd/iscsiuio.service | 4 +---
|
||||
6 files changed, 75 insertions(+), 15 deletions(-)
|
||||
create mode 100755 etc/systemd/iscsi-mark-root-nodes
|
||||
create mode 100644 etc/systemd/iscsi-onboot.service
|
||||
create mode 100644 etc/systemd/iscsi-shutdown.service
|
||||
|
||||
diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
|
||||
new file mode 100755
|
||||
index 0000000..c693707
|
||||
index 0000000..9d48805
|
||||
--- /dev/null
|
||||
+++ b/etc/systemd/iscsi-mark-root-nodes
|
||||
@@ -0,0 +1,30 @@
|
||||
@@ -0,0 +1,34 @@
|
||||
+#!/bin/bash
|
||||
+
|
||||
+ISCSIADM=/usr/sbin/iscsiadm
|
||||
|
@ -30,7 +32,11 @@ index 0000000..c693707
|
|||
+ portal=${p%,*}
|
||||
+ transport=${t%:}
|
||||
+
|
||||
+ $ISCSIADM -m node -p $portal -T $target -o update -n node.startup -v onboot
|
||||
+ # use session number to find the iface name in use
|
||||
+ num=${num#[}; num=${num%]}
|
||||
+ iface=$(iscsiadm -m session -r $num | grep iface.iscsi_ifacename | cut -d= -f2)
|
||||
+
|
||||
+ $ISCSIADM -m node -p $portal -T $target -I $iface -o update -n node.startup -v onboot
|
||||
+
|
||||
+ start_iscsid=1
|
||||
+
|
||||
|
@ -49,12 +55,33 @@ index 0000000..c693707
|
|||
+ systemctl --no-block start iscsiuio.service
|
||||
+fi
|
||||
+
|
||||
diff --git a/etc/systemd/iscsi-onboot.service b/etc/systemd/iscsi-onboot.service
|
||||
new file mode 100644
|
||||
index 0000000..42ced68
|
||||
--- /dev/null
|
||||
+++ b/etc/systemd/iscsi-onboot.service
|
||||
@@ -0,0 +1,15 @@
|
||||
+[Unit]
|
||||
+Description=Special handling of early boot iSCSI sessions
|
||||
+Documentation=man:iscsiadm(8) man:iscsid(8)
|
||||
+DefaultDependencies=no
|
||||
+RefuseManualStart=true
|
||||
+Before=iscsi.service
|
||||
+After=systemd-remount-fs.service
|
||||
+ConditionDirectoryNotEmpty=/sys/class/iscsi_session
|
||||
+
|
||||
+[Service]
|
||||
+Type=oneshot
|
||||
+ExecStart=-/usr/libexec/iscsi-mark-root-nodes
|
||||
+
|
||||
+[Install]
|
||||
+WantedBy=sysinit.target
|
||||
diff --git a/etc/systemd/iscsi-shutdown.service b/etc/systemd/iscsi-shutdown.service
|
||||
new file mode 100644
|
||||
index 0000000..69c1c77
|
||||
index 0000000..caee933
|
||||
--- /dev/null
|
||||
+++ b/etc/systemd/iscsi-shutdown.service
|
||||
@@ -0,0 +1,14 @@
|
||||
@@ -0,0 +1,15 @@
|
||||
+[Unit]
|
||||
+Description=Logout off all iSCSI sessions on shutdown
|
||||
+Documentation=man:iscsid(8) man:iscsiadm(8)
|
||||
|
@ -68,71 +95,75 @@ index 0000000..69c1c77
|
|||
+[Service]
|
||||
+Type=oneshot
|
||||
+RemainAfterExit=true
|
||||
+ExecStart=-/usr/bin/true
|
||||
+ExecStop=-/usr/sbin/iscsiadm -m node --logoutall=all
|
||||
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
|
||||
index e475888..eadfcec 100644
|
||||
index 5e394b9..26e557d 100644
|
||||
--- a/etc/systemd/iscsi.service
|
||||
+++ b/etc/systemd/iscsi.service
|
||||
@@ -1,18 +1,21 @@
|
||||
@@ -1,17 +1,17 @@
|
||||
[Unit]
|
||||
Description=Login and scanning of iSCSI devices
|
||||
-Documentation=man:iscsiadm(8) man:iscsid(8)
|
||||
Documentation=man:iscsiadm(8) man:iscsid(8)
|
||||
-Before=remote-fs.target
|
||||
-After=network.target network-online.target iscsid.service
|
||||
-Requires=iscsid.service
|
||||
-ConditionPathExists=/etc/iscsi/initiatorname.iscsi
|
||||
+Documentation=man:iscsid(8) man:iscsiadm(8)
|
||||
-After=network-online.target iscsid.service
|
||||
-Requires=iscsid.socket iscsi-init.service
|
||||
-Wants=network-online.target
|
||||
+DefaultDependencies=no
|
||||
+Conflicts=shutdown.target
|
||||
+After=systemd-remount-fs.service network.target iscsid.service iscsiuio.service
|
||||
+Before=remote-fs-pre.target
|
||||
+Wants=remote-fs-pre.target iscsi-shutdown.service
|
||||
+ConditionDirectoryNotEmpty=|/var/lib/iscsi/nodes
|
||||
+ConditionDirectoryNotEmpty=|/sys/class/iscsi_session
|
||||
+After=network.target network-online.target iscsid.service iscsiuio.service systemd-remount-fs.service
|
||||
+Wants=network-online.target remote-fs-pre.target iscsi-shutdown.service
|
||||
+ConditionDirectoryNotEmpty=/var/lib/iscsi/nodes
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
-ExecStart=/sbin/iscsiadm -m node --loginall=automatic
|
||||
-ExecStart=/sbin/iscsiadm -m node --loginall=automatic -W
|
||||
-ExecStop=/sbin/iscsiadm -m node --logoutall=automatic
|
||||
-ExecStop=/sbin/iscsiadm -m node --logoutall=manual
|
||||
-SuccessExitStatus=21
|
||||
RemainAfterExit=true
|
||||
+ExecStart=-/usr/libexec/iscsi-mark-root-nodes
|
||||
-SuccessExitStatus=21 15
|
||||
+ExecStart=-/usr/sbin/iscsiadm -m node --loginall=automatic
|
||||
+ExecReload=-/usr/sbin/iscsiadm -m node --loginall=automatic
|
||||
+SuccessExitStatus=21
|
||||
RemainAfterExit=true
|
||||
|
||||
[Install]
|
||||
-WantedBy=remote-fs.target
|
||||
+WantedBy=sysinit.target
|
||||
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
|
||||
index 4fef168..8d50cf0 100644
|
||||
index 3fd7dd3..3958dae 100644
|
||||
--- a/etc/systemd/iscsid.service
|
||||
+++ b/etc/systemd/iscsid.service
|
||||
@@ -1,14 +1,16 @@
|
||||
[Unit]
|
||||
@@ -2,15 +2,13 @@
|
||||
Description=Open-iSCSI
|
||||
-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
|
||||
+Documentation=man:iscsid(8) man:iscsiadm(8)
|
||||
Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8)
|
||||
DefaultDependencies=no
|
||||
+Conflicts=shutdown.target
|
||||
After=network.target iscsiuio.service
|
||||
-After=network-online.target iscsiuio.service iscsi-init.service
|
||||
+After=network.target network-online.target iscsiuio.service
|
||||
Before=remote-fs-pre.target
|
||||
-Wants=remote-fs-pre.target
|
||||
-Requires=iscsi-init.service
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
NotifyAccess=main
|
||||
-ExecStart=/sbin/iscsid -f
|
||||
+ExecStart=/usr/sbin/iscsid -f
|
||||
+ExecStop=/usr/sbin/iscsiadm -k 0 2
|
||||
KillMode=mixed
|
||||
Restart=on-failure
|
||||
|
||||
diff --git a/etc/systemd/iscsiuio.service b/etc/systemd/iscsiuio.service
|
||||
index e4d9fd0..8620cde 100644
|
||||
index 923e019..fc0be93 100644
|
||||
--- a/etc/systemd/iscsiuio.service
|
||||
+++ b/etc/systemd/iscsiuio.service
|
||||
@@ -11,7 +11,7 @@ Before=remote-fs-pre.target iscsid.service
|
||||
@@ -2,17 +2,15 @@
|
||||
Description=iSCSI UserSpace I/O driver
|
||||
Documentation=man:iscsiuio(8)
|
||||
DefaultDependencies=no
|
||||
-Conflicts=shutdown.target
|
||||
Requires=iscsid.service
|
||||
BindTo=iscsid.service
|
||||
After=network.target
|
||||
Before=remote-fs-pre.target iscsid.service
|
||||
-Wants=remote-fs-pre.target
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
NotifyAccess=main
|
||||
|
@ -142,5 +173,5 @@ index e4d9fd0..8620cde 100644
|
|||
Restart=on-failure
|
||||
|
||||
--
|
||||
2.21.0
|
||||
2.31.1
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From dbec0a5b7737142f8a1462cdf826c35a78e899b2 Mon Sep 17 00:00:00 2001
|
||||
From 45878c9461298c9da68a626d990dc4ef99e01baa Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Tue, 13 Aug 2013 10:59:44 -0700
|
||||
Subject: [PATCH 01/32] idmb_rec_write, check for tpgt first
|
||||
Subject: [PATCH] idmb_rec_write, check for tpgt first
|
||||
|
||||
Factor out the check for a tpgt to a single place, before going crazy on
|
||||
the rec files. Makes flow of this function easier to follow, and preps
|
||||
|
@ -11,12 +11,12 @@ for splitting it up.
|
|||
1 file changed, 5 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/usr/idbm.c b/usr/idbm.c
|
||||
index 830189f571ea..ab3577878e86 100644
|
||||
index 42c2699..e6ede85 100644
|
||||
--- a/usr/idbm.c
|
||||
+++ b/usr/idbm.c
|
||||
@@ -2042,6 +2042,10 @@ static int idbm_rec_write(node_rec_t *rec)
|
||||
if (rc)
|
||||
goto free_portal;
|
||||
@@ -2178,6 +2178,10 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
|
||||
goto free_portal;
|
||||
}
|
||||
|
||||
+ if (rec->tpgt == PORTAL_GROUP_TAG_UNKNOWN)
|
||||
+ /* drop down to old style portal as config */
|
||||
|
@ -25,7 +25,7 @@ index 830189f571ea..ab3577878e86 100644
|
|||
rc = stat(portal, &statb);
|
||||
if (rc) {
|
||||
rc = 0;
|
||||
@@ -2050,22 +2054,10 @@ static int idbm_rec_write(node_rec_t *rec)
|
||||
@@ -2186,22 +2190,10 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
|
||||
* set the tgpt. In new versions you must pass all the info in
|
||||
* from the start
|
||||
*/
|
||||
|
@ -50,5 +50,5 @@ index 830189f571ea..ab3577878e86 100644
|
|||
* Old style portal as a file, but with tpgt. Let's update it.
|
||||
*/
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,34 +1,38 @@
|
|||
From b9d89091daab823eb2dc72c6c568af7897f83137 Mon Sep 17 00:00:00 2001
|
||||
From 9823d8ead9e2d91765e4af39d906e25acd4e2a04 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Tue, 13 Aug 2013 11:34:31 -0700
|
||||
Subject: [PATCH 02/32] idbm_rec_write, seperate old and new style writes
|
||||
Subject: [PATCH 3/3] idbm_rec_write, seperate old and new style writes
|
||||
|
||||
Duplicates a small bit of code, but easier to understand and extened.
|
||||
---
|
||||
usr/idbm.c | 116 +++++++++++++++++++++++++++++++++++++++++--------------------
|
||||
1 file changed, 79 insertions(+), 37 deletions(-)
|
||||
usr/idbm.c | 129 +++++++++++++++++++++++++++++++++++------------------
|
||||
1 file changed, 86 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/usr/idbm.c b/usr/idbm.c
|
||||
index ab3577878e86..21ff61ab2bd8 100644
|
||||
index efdda75..307a01a 100644
|
||||
--- a/usr/idbm.c
|
||||
+++ b/usr/idbm.c
|
||||
@@ -2001,7 +2001,7 @@ mkdir_portal:
|
||||
@@ -2152,12 +2152,7 @@ mkdir_portal:
|
||||
return f;
|
||||
}
|
||||
|
||||
-static int idbm_rec_write(node_rec_t *rec)
|
||||
-/*
|
||||
- * When the disable_lock param is true, the idbm_lock/idbm_unlock needs
|
||||
- * to be holt by the caller, this will avoid overwriting each other in
|
||||
- * case of updating(read-modify-write) the recs in parallel.
|
||||
- */
|
||||
-static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
|
||||
+static int idbm_rec_write_new(node_rec_t *rec)
|
||||
{
|
||||
struct stat statb;
|
||||
FILE *f;
|
||||
@@ -2013,38 +2013,8 @@ static int idbm_rec_write(node_rec_t *rec)
|
||||
log_error("Could not alloc portal");
|
||||
@@ -2170,39 +2165,8 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
|
||||
return ISCSI_ERR_NOMEM;
|
||||
}
|
||||
-
|
||||
|
||||
- snprintf(portal, PATH_MAX, "%s", NODE_CONFIG_DIR);
|
||||
- if (access(portal, F_OK) != 0) {
|
||||
- if (mkdir(portal, 0660) != 0) {
|
||||
- if (mkdir(portal, 0770) != 0) {
|
||||
- log_error("Could not make %s: %s", portal,
|
||||
- strerror(errno));
|
||||
- rc = ISCSI_ERR_IDBM;
|
||||
|
@ -38,7 +42,7 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
-
|
||||
- snprintf(portal, PATH_MAX, "%s/%s", NODE_CONFIG_DIR, rec->name);
|
||||
- if (access(portal, F_OK) != 0) {
|
||||
- if (mkdir(portal, 0660) != 0) {
|
||||
- if (mkdir(portal, 0770) != 0) {
|
||||
- log_error("Could not make %s: %s", portal,
|
||||
- strerror(errno));
|
||||
- rc = ISCSI_ERR_IDBM;
|
||||
|
@ -50,9 +54,11 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
rec->name, rec->conn[0].address, rec->conn[0].port);
|
||||
- log_debug(5, "Looking for config file %s", portal);
|
||||
-
|
||||
- rc = idbm_lock();
|
||||
- if (rc)
|
||||
- goto free_portal;
|
||||
- if (!disable_lock) {
|
||||
- rc = idbm_lock();
|
||||
- if (rc)
|
||||
- goto free_portal;
|
||||
- }
|
||||
-
|
||||
- if (rec->tpgt == PORTAL_GROUP_TAG_UNKNOWN)
|
||||
- /* drop down to old style portal as config */
|
||||
|
@ -60,7 +66,7 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
|
||||
rc = stat(portal, &statb);
|
||||
if (rc) {
|
||||
@@ -2065,11 +2035,11 @@ static int idbm_rec_write(node_rec_t *rec)
|
||||
@@ -2223,11 +2187,11 @@ static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
|
||||
log_error("Could not convert %s: %s", portal,
|
||||
strerror(errno));
|
||||
rc = ISCSI_ERR_IDBM;
|
||||
|
@ -74,7 +80,7 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
}
|
||||
|
||||
mkdir_portal:
|
||||
@@ -2080,24 +2050,96 @@ mkdir_portal:
|
||||
@@ -2238,24 +2202,103 @@ mkdir_portal:
|
||||
log_error("Could not make dir %s: %s",
|
||||
portal, strerror(errno));
|
||||
rc = ISCSI_ERR_IDBM;
|
||||
|
@ -87,7 +93,7 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
rec->name, rec->conn[0].address, rec->conn[0].port, rec->tpgt,
|
||||
rec->iface.name);
|
||||
-open_conf:
|
||||
+/* open_conf: */
|
||||
+
|
||||
f = fopen(portal, "w");
|
||||
if (!f) {
|
||||
log_error("Could not open %s: %s", portal, strerror(errno));
|
||||
|
@ -131,7 +137,12 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
+ return rc;
|
||||
+}
|
||||
+
|
||||
+static int idbm_rec_write(node_rec_t *rec)
|
||||
+/*
|
||||
+ * When the disable_lock param is true, the idbm_lock/idbm_unlock needs
|
||||
+ * to be holt by the caller, this will avoid overwriting each other in
|
||||
+ * case of updating(read-modify-write) the recs in parallel.
|
||||
+ */
|
||||
+static int idbm_rec_write(node_rec_t *rec, bool disable_lock)
|
||||
+{
|
||||
+ char *portal;
|
||||
+ int rc = 0;
|
||||
|
@ -144,7 +155,7 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
+
|
||||
+ snprintf(portal, PATH_MAX, "%s", NODE_CONFIG_DIR);
|
||||
+ if (access(portal, F_OK) != 0) {
|
||||
+ if (mkdir(portal, 0660) != 0) {
|
||||
+ if (mkdir(portal, 0770) != 0) {
|
||||
+ log_error("Could not make %s: %s", portal,
|
||||
+ strerror(errno));
|
||||
+ rc = ISCSI_ERR_IDBM;
|
||||
|
@ -154,7 +165,7 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
+
|
||||
+ snprintf(portal, PATH_MAX, "%s/%s", NODE_CONFIG_DIR, rec->name);
|
||||
+ if (access(portal, F_OK) != 0) {
|
||||
+ if (mkdir(portal, 0660) != 0) {
|
||||
+ if (mkdir(portal, 0770) != 0) {
|
||||
+ log_error("Could not make %s: %s", portal,
|
||||
+ strerror(errno));
|
||||
+ rc = ISCSI_ERR_IDBM;
|
||||
|
@ -162,9 +173,11 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
+ }
|
||||
+ }
|
||||
+
|
||||
+ rc = idbm_lock();
|
||||
+ if (rc)
|
||||
+ goto free_portal;
|
||||
+ if (!disable_lock) {
|
||||
+ rc = idbm_lock();
|
||||
+ if (rc)
|
||||
+ goto free_portal;
|
||||
+ }
|
||||
+
|
||||
+ if (rec->tpgt == PORTAL_GROUP_TAG_UNKNOWN)
|
||||
+ /* old style portal as config */
|
||||
|
@ -172,9 +185,9 @@ index ab3577878e86..21ff61ab2bd8 100644
|
|||
+ else
|
||||
+ rc = idbm_rec_write_new(rec);
|
||||
+
|
||||
idbm_unlock();
|
||||
if (!disable_lock)
|
||||
idbm_unlock();
|
||||
free_portal:
|
||||
free(portal);
|
||||
--
|
||||
2.14.4
|
||||
2.31.1
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From bf6a05987a418e4d7eeb3a24f0912c5cfc9e533d Mon Sep 17 00:00:00 2001
|
||||
From 2b1c0c5f1f2dbc516a9b51950a82eac091dbce2c Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Tue, 13 Aug 2013 12:39:07 -0700
|
||||
Subject: [PATCH] idbw_rec_write, pick tpgt from existing record
|
||||
|
@ -12,7 +12,7 @@ updated new style record instead.
|
|||
1 file changed, 40 insertions(+)
|
||||
|
||||
diff --git a/usr/idbm.c b/usr/idbm.c
|
||||
index c29cbed..00955e4 100644
|
||||
index bc51388..f1e5c88 100644
|
||||
--- a/usr/idbm.c
|
||||
+++ b/usr/idbm.c
|
||||
@@ -28,6 +28,7 @@
|
||||
|
@ -23,21 +23,21 @@ index c29cbed..00955e4 100644
|
|||
#include <sys/stat.h>
|
||||
#include <sys/file.h>
|
||||
#include <inttypes.h>
|
||||
@@ -164,6 +165,8 @@ static struct idbm *db;
|
||||
_n++; \
|
||||
} while(0)
|
||||
@@ -203,6 +204,8 @@ static struct int_list_tbl {
|
||||
{ "SHA3-256", AUTH_CHAP_ALG_SHA3_256 },
|
||||
};
|
||||
|
||||
+static int idbm_remove_disc_to_node_link(node_rec_t *rec, char *portal);
|
||||
+
|
||||
static void
|
||||
idbm_recinfo_discovery(discovery_rec_t *r, recinfo_t *ri)
|
||||
{
|
||||
@@ -2080,12 +2083,49 @@ static int idbm_rec_write_old(node_rec_t *rec)
|
||||
@@ -2207,12 +2210,49 @@ static int idbm_rec_write_old(node_rec_t *rec)
|
||||
FILE *f;
|
||||
char *portal;
|
||||
int rc = 0;
|
||||
+ glob_t globbuf;
|
||||
+ int i;
|
||||
+ size_t i;
|
||||
+ int tpgt = PORTAL_GROUP_TAG_UNKNOWN;
|
||||
|
||||
portal = malloc(PATH_MAX);
|
||||
|
@ -83,5 +83,5 @@ index c29cbed..00955e4 100644
|
|||
rec->name, rec->conn[0].address, rec->conn[0].port);
|
||||
|
||||
--
|
||||
2.21.0
|
||||
2.26.2
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
From 2e6f564ebb3c85cb9a457d282b845374776a54ae Mon Sep 17 00:00:00 2001
|
||||
From 97b1242450df25648d203acf7cc297cd46d10e8c Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Mon, 19 Nov 2012 16:37:13 -0800
|
||||
Subject: [PATCH 06/32] update initscripts and docs
|
||||
Subject: [PATCH] update initscripts and docs
|
||||
|
||||
---
|
||||
README | 10 ++++------
|
||||
etc/iscsid.conf | 21 ++++++++++-----------
|
||||
README | 12 +++++-------
|
||||
etc/iscsid.conf | 23 +++++++++++------------
|
||||
usr/idbm.c | 4 ++++
|
||||
3 files changed, 18 insertions(+), 17 deletions(-)
|
||||
3 files changed, 20 insertions(+), 19 deletions(-)
|
||||
|
||||
diff --git a/README b/README
|
||||
index 2499d9a7b638..c05814a2593b 100644
|
||||
index 508c9d7..b62a14e 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -77,11 +77,6 @@ the cache sync command will fail.
|
||||
|
@ -25,16 +25,21 @@ index 2499d9a7b638..c05814a2593b 100644
|
|||
The userspace components iscsid, iscsiadm and iscsistart require the
|
||||
open-isns library, which can be found here:
|
||||
https://github.com/gonzoleeman/open-isns/releases
|
||||
@@ -1151,7 +1146,7 @@ Red Hat or Fedora:
|
||||
@@ -1163,11 +1158,11 @@ Red Hat or Fedora:
|
||||
-----------------
|
||||
To start open-iscsi in Red Hat/Fedora you can do:
|
||||
|
||||
- service open-iscsi start
|
||||
+ service iscsi start
|
||||
- systemctl start open-iscsi
|
||||
+ systemctl start iscsi
|
||||
|
||||
To get open-iscsi to automatically start at run time you may have to
|
||||
run:
|
||||
@@ -1353,6 +1348,9 @@ iscsid will only perform rediscovery when it gets a SCN from the server.
|
||||
- systemctl enable open-iscsi
|
||||
+ systemctl enable iscsi
|
||||
|
||||
And, to automatically mount a file system during startup
|
||||
you must have the partition entry in /etc/fstab marked with the "_netdev"
|
||||
@@ -1370,6 +1365,9 @@ iscsid will only perform rediscovery when it gets a SCN from the server.
|
||||
# linux-isns (SLES's iSNS server) where it sometimes does not send SCN
|
||||
# events in the proper format, so they may not get handled.
|
||||
|
||||
|
@ -45,18 +50,20 @@ index 2499d9a7b638..c05814a2593b 100644
|
|||
--------
|
||||
|
||||
diff --git a/etc/iscsid.conf b/etc/iscsid.conf
|
||||
index fee11482a09b..3539ac4cd578 100644
|
||||
index f21ed3d..420145b 100644
|
||||
--- a/etc/iscsid.conf
|
||||
+++ b/etc/iscsid.conf
|
||||
@@ -19,7 +19,7 @@
|
||||
@@ -19,8 +19,8 @@
|
||||
# the time then leave this attribute commented out.
|
||||
#
|
||||
# Default for Fedora and RHEL. (uncomment to activate).
|
||||
-# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.soccket
|
||||
-# iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
|
||||
-#
|
||||
+iscsid.startup = /bin/systemctl start iscsid.socket iscsiuio.socket
|
||||
#
|
||||
+#
|
||||
# Default if you are not using systemd (uncomment to activate)
|
||||
# iscsid.startup = /usr/bin/service start iscsid
|
||||
|
||||
@@ -41,8 +41,8 @@
|
||||
# To request that the iscsi initd scripts startup a session set to "automatic".
|
||||
# node.startup = automatic
|
||||
|
@ -68,7 +75,7 @@ index fee11482a09b..3539ac4cd578 100644
|
|||
|
||||
# For "automatic" startup nodes, setting this to "Yes" will try logins on each
|
||||
# available iface until one succeeds, and then stop. The default "No" will try
|
||||
@@ -264,28 +264,27 @@ node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
|
||||
@@ -271,28 +271,27 @@ node.conn[0].iscsi.MaxXmitDataSegmentLength = 0
|
||||
discovery.sendtargets.iscsi.MaxRecvDataSegmentLength = 32768
|
||||
|
||||
# To allow the targets to control the setting of the digest checking,
|
||||
|
@ -105,10 +112,10 @@ index fee11482a09b..3539ac4cd578 100644
|
|||
# For multipath configurations, you may want more than one session to be
|
||||
# created on each iface record. If node.session.nr_sessions is greater
|
||||
diff --git a/usr/idbm.c b/usr/idbm.c
|
||||
index cd705fa2b033..0aa3870a76fd 100644
|
||||
index f1e5c88..0f0f17a 100644
|
||||
--- a/usr/idbm.c
|
||||
+++ b/usr/idbm.c
|
||||
@@ -518,9 +518,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
|
||||
@@ -566,9 +566,13 @@ idbm_recinfo_node(node_rec_t *r, recinfo_t *ri)
|
||||
IDBM_SHOW, "None", "CRC32C", "CRC32C,None",
|
||||
"None,CRC32C", num, 1);
|
||||
sprintf(key, CONN_DATA_DIGEST, i);
|
||||
|
@ -123,5 +130,5 @@ index cd705fa2b033..0aa3870a76fd 100644
|
|||
__recinfo_int_o2(key, ri, r, conn[i].iscsi.IFMarker, IDBM_SHOW,
|
||||
"No", "Yes", num, 1);
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 29769497994066772429d57937dc3a8c0f515304 Mon Sep 17 00:00:00 2001
|
||||
From e6ab14371300e45c4f03efa64917f7601675f01d Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Mon, 19 Nov 2012 16:38:45 -0800
|
||||
Subject: [PATCH] use var for config
|
||||
Subject: [PATCH 1/1] use var for config
|
||||
|
||||
---
|
||||
README | 33 ++++++++++++++++-----------------
|
||||
|
@ -13,7 +13,7 @@ Subject: [PATCH] use var for config
|
|||
6 files changed, 33 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/README b/README
|
||||
index c05814a..326c3b0 100644
|
||||
index b62a14e..1875e3d 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -172,8 +172,7 @@ Usage: iscsid [OPTION]
|
||||
|
@ -26,7 +26,7 @@ index c05814a..326c3b0 100644
|
|||
|
||||
Configuration is contained in directories for:
|
||||
|
||||
@@ -561,7 +560,7 @@ a scsi_host per HBA port).
|
||||
@@ -573,7 +572,7 @@ a scsi_host per HBA port).
|
||||
To manage both types of initiator stacks, iscsiadm uses the interface (iface)
|
||||
structure. For each HBA port or for software iscsi for each network
|
||||
device (ethX) or NIC, that you wish to bind sessions to you must create
|
||||
|
@ -35,7 +35,7 @@ index c05814a..326c3b0 100644
|
|||
|
||||
Prep
|
||||
----
|
||||
@@ -594,7 +593,7 @@ Running
|
||||
@@ -606,7 +605,7 @@ Running
|
||||
The command
|
||||
iscsiadm -m iface
|
||||
|
||||
|
@ -44,7 +44,7 @@ index c05814a..326c3b0 100644
|
|||
|
||||
iface0 qla4xxx,00:c0:dd:08:63:e8,20.15.0.7,default,iqn.2005-06.com.redhat:madmax
|
||||
iface1 qla4xxx,00:c0:dd:08:63:ea,20.15.0.9,default,iqn.2005-06.com.redhat:madmax
|
||||
@@ -604,10 +603,10 @@ The format is:
|
||||
@@ -616,10 +615,10 @@ The format is:
|
||||
|
||||
For software iscsi, you can create the iface configs by hand, but it is
|
||||
recommended that you use iscsiadm's iface mode. There is an iface.example in
|
||||
|
@ -57,7 +57,7 @@ index c05814a..326c3b0 100644
|
|||
must have a unique name which is less than or equal to 64 characters.
|
||||
|
||||
Example
|
||||
@@ -615,12 +614,12 @@ Example
|
||||
@@ -627,12 +626,12 @@ Example
|
||||
|
||||
If you have NIC1 with MAC address 00:0F:1F:92:6B:BF and NIC2 with
|
||||
MAC address 00:C0:DD:08:63:E7, and you wanted to do software iscsi over
|
||||
|
@ -72,7 +72,7 @@ index c05814a..326c3b0 100644
|
|||
|
||||
iface.transport_name = tcp
|
||||
iface.hwaddress = 00:C0:DD:08:63:E7
|
||||
@@ -662,7 +661,7 @@ port. The iface name will be of the form:
|
||||
@@ -674,7 +673,7 @@ port. The iface name will be of the form:
|
||||
Running the following command:
|
||||
iscsiadm -m iface
|
||||
|
||||
|
@ -81,7 +81,7 @@ index c05814a..326c3b0 100644
|
|||
|
||||
default tcp,<empty>,<empty>,<empty>,<empty>
|
||||
iser iser,<empty>,<empty>,<empty>,<empty>
|
||||
@@ -742,7 +741,7 @@ need a separate network connection to the target for discovery purposes.
|
||||
@@ -754,7 +753,7 @@ need a separate network connection to the target for discovery purposes.
|
||||
*This will be fixed in the next version of open-iscsi*
|
||||
|
||||
For compatibility reasons, when you run iscsiadm to do discovery, it
|
||||
|
@ -90,7 +90,7 @@ index c05814a..326c3b0 100644
|
|||
tcp for the iface.transport, and it will bind the portals that are discovered
|
||||
so that they will be logged in through those ifaces. This behavior can also
|
||||
be overridden by passing in the interfaces you want to use. For the case
|
||||
@@ -757,7 +756,7 @@ If you had defined interfaces but wanted the old behavior, where we do not
|
||||
@@ -769,7 +768,7 @@ If you had defined interfaces but wanted the old behavior, where we do not
|
||||
bind a session to an iface, then you can use the special iface "default":
|
||||
iscsiadm -m discoverydb -t st -p ip:port -I default --discover -P 1
|
||||
|
||||
|
@ -99,7 +99,7 @@ index c05814a..326c3b0 100644
|
|||
not pass anything into iscsiadm, running iscsiadm will do the default
|
||||
behavior, allowing the network subsystem to decide which device to use.
|
||||
|
||||
@@ -793,7 +792,7 @@ Discovery mode
|
||||
@@ -805,7 +804,7 @@ Discovery mode
|
||||
ID [192.168.1.1:3260]:
|
||||
iscsiadm -m discoverydb -t st -p 192.168.1.1:3260 --discover
|
||||
|
||||
|
@ -108,7 +108,7 @@ index c05814a..326c3b0 100644
|
|||
ID [portal = 192.168.1.1:3260 and type = sendtargets. If found it
|
||||
will perform discovery using the settings stored in the record.
|
||||
If a record does not exist, it will be created using the iscsid.conf
|
||||
@@ -802,7 +801,7 @@ Discovery mode
|
||||
@@ -814,7 +813,7 @@ Discovery mode
|
||||
The argument to -p may also be a hostname instead of an address:
|
||||
iscsiadm -m discoverydb -t st -p somehost --discover
|
||||
|
||||
|
@ -117,7 +117,7 @@ index c05814a..326c3b0 100644
|
|||
interfaces using software iscsi. If any are found then nodes found
|
||||
during discovery will be setup so that they can logged in through
|
||||
those interfaces. To specify a specific iface, pass the
|
||||
@@ -853,7 +852,7 @@ Discovery mode
|
||||
@@ -865,7 +864,7 @@ Discovery mode
|
||||
|
||||
- SendTargets iSCSI Discovery with a specific interface.
|
||||
If you wish to only use a subset of the interfaces in
|
||||
|
@ -126,7 +126,7 @@ index c05814a..326c3b0 100644
|
|||
iscsiadm -m discoverydb -t sendtargets -p 192.168.1.1:3260 \
|
||||
--interface=iface0 --interface=iface1 --discover
|
||||
|
||||
@@ -1223,8 +1222,8 @@ where targetname is the name of the target and ip_address:port is the address
|
||||
@@ -1232,8 +1231,8 @@ where targetname is the name of the target and ip_address:port is the address
|
||||
and port of the portal. tpgt is the Target Portal Group Tag of
|
||||
the portal, and is not used in iscsiadm commands except for static
|
||||
record creation. ifacename is the name of the iscsi interface
|
||||
|
@ -137,7 +137,7 @@ index c05814a..326c3b0 100644
|
|||
Default here is iscsi_tcp/tcp to be used over whichever NIC the
|
||||
network layer decides is best.
|
||||
|
||||
@@ -1336,7 +1335,7 @@ If set, iscsid will perform discovery to the address every
|
||||
@@ -1353,7 +1352,7 @@ If set, iscsid will perform discovery to the address every
|
||||
discovery.isns.discoveryd_poll_inval or
|
||||
discovery.sendtargets.discoveryd_poll_inval seconds,
|
||||
and it will log into any portals found from the discovery source using
|
||||
|
@ -147,7 +147,7 @@ index c05814a..326c3b0 100644
|
|||
Note that for iSNS the poll_interval does not have to be set. If not set,
|
||||
iscsid will only perform rediscovery when it gets a SCN from the server.
|
||||
diff --git a/doc/iscsiadm.8 b/doc/iscsiadm.8
|
||||
index bf23dd2..9cfce16 100644
|
||||
index 3729a72..9f84a81 100644
|
||||
--- a/doc/iscsiadm.8
|
||||
+++ b/doc/iscsiadm.8
|
||||
@@ -228,7 +228,7 @@ This option is only valid for ping submode.
|
||||
|
@ -159,7 +159,7 @@ index bf23dd2..9cfce16 100644
|
|||
iSCSI (qla4xxx) the iface config must have the hardware address
|
||||
(iface.hwaddress = port's MAC address)
|
||||
and the driver/transport_name (iface.transport_name). The iface's name is
|
||||
@@ -301,7 +301,7 @@ If no other options are specified: for \fIdiscovery\fR, \fIdiscoverydb\fR and
|
||||
@@ -318,7 +318,7 @@ If no other options are specified: for \fIdiscovery\fR, \fIdiscoverydb\fR and
|
||||
\fInode\fR, all of their respective records are displayed; for \fIsession\fR,
|
||||
all active sessions and connections are displayed; for \fIfw\fR, all boot
|
||||
firmware values are displayed; for \fIhost\fR, all iSCSI hosts are displayed;
|
||||
|
@ -168,7 +168,7 @@ index bf23dd2..9cfce16 100644
|
|||
.TP
|
||||
\fB\-n\fR, \fB\-\-name=\fIname\fR
|
||||
In node mode, specify a field \fIname\fR in a record. In flashnode submode
|
||||
@@ -640,10 +640,10 @@ The configuration file read by \fBiscsid\fR and \fBiscsiadm\fR on startup.
|
||||
@@ -681,10 +681,10 @@ The configuration file read by \fBiscsid\fR and \fBiscsiadm\fR on startup.
|
||||
The file containing the iSCSI InitiatorName and InitiatorAlias read by
|
||||
\fBiscsid\fR and \fBiscsiadm\fR on startup.
|
||||
.TP
|
||||
|
@ -182,10 +182,10 @@ index bf23dd2..9cfce16 100644
|
|||
.SH "SEE ALSO"
|
||||
.BR iscsid (8)
|
||||
diff --git a/doc/iscsid.8 b/doc/iscsid.8
|
||||
index 6f9218f..0da0551 100644
|
||||
index db996b4..eaa9c3b 100644
|
||||
--- a/doc/iscsid.8
|
||||
+++ b/doc/iscsid.8
|
||||
@@ -65,7 +65,7 @@ and
|
||||
@@ -70,7 +70,7 @@ and
|
||||
.B iscsiadm
|
||||
on startup.
|
||||
.TP
|
||||
|
@ -195,27 +195,27 @@ index 6f9218f..0da0551 100644
|
|||
|
||||
.SH "SEE ALSO"
|
||||
diff --git a/usr/idbm.c b/usr/idbm.c
|
||||
index f3c812e..8b96146 100644
|
||||
index 7c63c04..779d052 100644
|
||||
--- a/usr/idbm.c
|
||||
+++ b/usr/idbm.c
|
||||
@@ -2929,9 +2929,9 @@ free_info:
|
||||
@@ -3104,9 +3104,9 @@ free_info:
|
||||
int idbm_init(idbm_get_config_file_fn *fn)
|
||||
{
|
||||
/* make sure root db dir is there */
|
||||
- if (access(ISCSI_CONFIG_ROOT, F_OK) != 0) {
|
||||
- if (mkdir(ISCSI_CONFIG_ROOT, 0660) != 0) {
|
||||
- if (mkdir(ISCSI_CONFIG_ROOT, 0770) != 0) {
|
||||
- log_error("Could not make %s %d", ISCSI_CONFIG_ROOT,
|
||||
+ if (access(ISCSIVAR, F_OK) != 0) {
|
||||
+ if (mkdir(ISCSIVAR, 0660) != 0) {
|
||||
+ if (mkdir(ISCSIVAR, 0770) != 0) {
|
||||
+ log_error("Could not make %s %d", ISCSIVAR,
|
||||
errno);
|
||||
return errno;
|
||||
}
|
||||
diff --git a/usr/idbm.h b/usr/idbm.h
|
||||
index b83c0bb..2b05d78 100644
|
||||
index 7496f1d..db3048b 100644
|
||||
--- a/usr/idbm.h
|
||||
+++ b/usr/idbm.h
|
||||
@@ -29,12 +29,13 @@
|
||||
@@ -30,12 +30,13 @@
|
||||
#include "list.h"
|
||||
#include "flashnode.h"
|
||||
|
||||
|
@ -251,5 +251,5 @@ index 6c06f7f..c8b9de9 100644
|
|||
struct iface_rec;
|
||||
struct list_head;
|
||||
--
|
||||
2.21.0
|
||||
2.31.1
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From ea35362504329e7fe86f4af17a88bed009c5069c Mon Sep 17 00:00:00 2001
|
||||
From 8312003a6a9e41d8d20eb8225ec8c4b2860351ec Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Mon, 19 Nov 2012 16:40:04 -0800
|
||||
Subject: [PATCH 08/32] use red hat for name
|
||||
Subject: [PATCH] use red hat for name
|
||||
|
||||
---
|
||||
doc/iscsi-iname.8 | 2 +-
|
||||
|
@ -9,31 +9,31 @@ Subject: [PATCH 08/32] use red hat for name
|
|||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/doc/iscsi-iname.8 b/doc/iscsi-iname.8
|
||||
index a55d666d1af3..dd77ed9f3165 100644
|
||||
index 6a413f6..dd77ed9 100644
|
||||
--- a/doc/iscsi-iname.8
|
||||
+++ b/doc/iscsi-iname.8
|
||||
@@ -14,7 +14,7 @@ generates a unique iSCSI node name on every invocation.
|
||||
Display help
|
||||
.TP
|
||||
.BI [-p=]\fIprefix\fP
|
||||
-Use the prefix passed in instead of the default "iqn.2005-03.org.open-iscsi"
|
||||
-Use the prefix passed in instead of the default "iqn.2016-04.com.open-iscsi"
|
||||
+Use the prefix passed in instead of the default "iqn.1994-05.com.redhat"
|
||||
|
||||
.SH AUTHORS
|
||||
Open-iSCSI project <http://www.open-iscsi.com/>
|
||||
diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c
|
||||
index 6347edc46293..cb2f6c8b8651 100644
|
||||
index 0f587e1..0e15650 100644
|
||||
--- a/utils/iscsi-iname.c
|
||||
+++ b/utils/iscsi-iname.c
|
||||
@@ -73,7 +73,7 @@ main(int argc, char *argv[])
|
||||
@@ -89,7 +89,7 @@ main(int argc, char *argv[])
|
||||
exit(0);
|
||||
}
|
||||
} else {
|
||||
- prefix = "iqn.2005-03.org.open-iscsi";
|
||||
- prefix = "iqn.2016-04.com.open-iscsi";
|
||||
+ prefix = "iqn.1994-05.com.redhat";
|
||||
}
|
||||
|
||||
/* try to feed some entropy from the pool to MD5 in order to get
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
From e2973cb7d4bca9056702b698511c020c93438e2a Mon Sep 17 00:00:00 2001
|
||||
From 8b4da8007ef59bbc833fed882ddae57bbcd51f1c Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Mon, 26 Jan 2015 12:57:11 -0800
|
||||
Subject: [PATCH] libiscsi
|
||||
|
@ -45,10 +45,10 @@ Subject: [PATCH] libiscsi
|
|||
create mode 100644 libiscsi/tests/test_set_auth.c
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 9a33774..bef6f1f 100644
|
||||
index 7b445a5..4ab091f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -58,6 +58,7 @@ user: iscsiuio/Makefile
|
||||
@@ -65,6 +65,7 @@ user: iscsiuio/Makefile
|
||||
$(MAKE) -C usr
|
||||
$(MAKE) -C utils
|
||||
$(MAKE) -C iscsiuio
|
||||
|
@ -56,7 +56,7 @@ index 9a33774..bef6f1f 100644
|
|||
@echo
|
||||
@echo "Compilation complete Output file"
|
||||
@echo "----------------------------------- ----------------"
|
||||
@@ -78,6 +79,7 @@ iscsiuio/configure iscsiuio/Makefile.in: iscsiuio/configure.ac iscsiuio/Makefile
|
||||
@@ -85,6 +86,7 @@ iscsiuio/configure iscsiuio/Makefile.in: iscsiuio/configure.ac iscsiuio/Makefile
|
||||
force: ;
|
||||
|
||||
clean:
|
||||
|
@ -3914,12 +3914,12 @@ index 0000000..a21f888
|
|||
+ return rc;
|
||||
+}
|
||||
diff --git a/usr/Makefile b/usr/Makefile
|
||||
index 0203127..e4752e6 100644
|
||||
index 21bb154..885243a 100644
|
||||
--- a/usr/Makefile
|
||||
+++ b/usr/Makefile
|
||||
@@ -37,7 +37,7 @@ PKG_CONFIG = /usr/bin/pkg-config
|
||||
CFLAGS ?= -O2 -g
|
||||
WARNFLAGS ?= -Wall -Wstrict-prototypes
|
||||
WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
|
||||
CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
|
||||
- -I$(TOPDIR)/libopeniscsiusr
|
||||
+ -I$(TOPDIR)/libopeniscsiusr -DISNS_ENABLE
|
||||
|
@ -3927,7 +3927,7 @@ index 0203127..e4752e6 100644
|
|||
ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
|
||||
LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod)
|
||||
diff --git a/usr/discovery.c b/usr/discovery.c
|
||||
index 199c160..d17a250 100644
|
||||
index 7dec696..2cf1838 100644
|
||||
--- a/usr/discovery.c
|
||||
+++ b/usr/discovery.c
|
||||
@@ -36,6 +36,7 @@
|
||||
|
@ -3965,50 +3965,50 @@ index 199c160..d17a250 100644
|
|||
}
|
||||
+#endif
|
||||
|
||||
int discovery_fw(void *data, struct iface_rec *iface,
|
||||
struct list_head *rec_list)
|
||||
int discovery_fw(void *data,
|
||||
__attribute__((unused))struct iface_rec *iface,
|
||||
diff --git a/usr/idbm.c b/usr/idbm.c
|
||||
index 8b96146..19f7e84 100644
|
||||
index 27cad0a..2498a03 100644
|
||||
--- a/usr/idbm.c
|
||||
+++ b/usr/idbm.c
|
||||
@@ -1712,9 +1712,9 @@ int idbm_print_all_discovery(int info_level)
|
||||
@@ -1825,9 +1825,9 @@ int idbm_print_all_discovery(int info_level)
|
||||
* fn should return -1 if it skipped the rec, an ISCSI_ERR error code if
|
||||
* the operation failed or 0 if fn was run successfully.
|
||||
*/
|
||||
-static int idbm_for_each_iface(int *found, void *data,
|
||||
- idbm_iface_op_fn *fn,
|
||||
- char *targetname, int tpgt, char *ip, int port)
|
||||
+int idbm_for_each_iface(int *found, void *data,
|
||||
+ idbm_iface_op_fn *fn,
|
||||
+ char *targetname, int tpgt, char *ip, int port)
|
||||
-static int idbm_for_each_iface(int *found, void *data, idbm_iface_op_fn *fn,
|
||||
- char *targetname, int tpgt, char *ip, int port,
|
||||
- bool ruw_lock)
|
||||
+int idbm_for_each_iface(int *found, void *data, idbm_iface_op_fn *fn,
|
||||
+ char *targetname, int tpgt, char *ip, int port,
|
||||
+ bool ruw_lock)
|
||||
{
|
||||
DIR *iface_dirfd;
|
||||
struct dirent *iface_dent;
|
||||
diff --git a/usr/idbm.h b/usr/idbm.h
|
||||
index 2b05d78..b9b1810 100644
|
||||
index ce098b7..d1a7f63 100644
|
||||
--- a/usr/idbm.h
|
||||
+++ b/usr/idbm.h
|
||||
@@ -102,6 +102,9 @@ struct rec_op_data {
|
||||
@@ -105,6 +105,9 @@ struct rec_op_data {
|
||||
node_rec_t *match_rec;
|
||||
idbm_iface_op_fn *fn;
|
||||
};
|
||||
+extern int idbm_for_each_iface(int *found, void *data,
|
||||
+ idbm_iface_op_fn *fn,
|
||||
+ char *targetname, int tpgt, char *ip, int port);
|
||||
extern int idbm_for_each_portal(int *found, void *data,
|
||||
idbm_portal_op_fn *fn, char *targetname);
|
||||
+extern int idbm_for_each_iface(int *found, void *data, idbm_iface_op_fn *fn,
|
||||
+ char *targetname, int tpgt, char *ip, int port,
|
||||
+ bool ruw_lock);
|
||||
extern int idbm_for_each_portal(int *found, void *data, idbm_portal_op_fn *fn,
|
||||
char *targetname, bool ruw_lock);
|
||||
extern int idbm_for_each_node(int *found, void *data,
|
||||
diff --git a/usr/iscsi_ipc.h b/usr/iscsi_ipc.h
|
||||
index 47857dd..fb8e965 100644
|
||||
index 47857dd..596543b 100644
|
||||
--- a/usr/iscsi_ipc.h
|
||||
+++ b/usr/iscsi_ipc.h
|
||||
@@ -162,4 +162,6 @@ struct iscsi_ipc {
|
||||
char *host_stats);
|
||||
};
|
||||
|
||||
+struct iscsi_ipc *ipc;
|
||||
+extern struct iscsi_ipc *ipc;
|
||||
+
|
||||
#endif /* ISCSI_IPC_H */
|
||||
--
|
||||
2.21.0
|
||||
2.26.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From bd26fd7e7f91e5c4c6903c3d7e1a375a14261a48 Mon Sep 17 00:00:00 2001
|
||||
From 676f48d6e70f8406b36a004669d923825db51e2f Mon Sep 17 00:00:00 2001
|
||||
From: Jiri Konecny <jkonecny@redhat.com>
|
||||
Date: Mon, 11 May 2015 13:16:26 +0200
|
||||
Subject: [PATCH 18/32] Add macros to release GIL lock
|
||||
Subject: [PATCH] Add macros to release GIL lock
|
||||
|
||||
Other threads are blocked when GIL is not released before the time consuming
|
||||
functions.
|
||||
|
@ -10,7 +10,7 @@ functions.
|
|||
1 file changed, 13 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libiscsi/pylibiscsi.c b/libiscsi/pylibiscsi.c
|
||||
index 88008538f04f..40b59553a28e 100644
|
||||
index 8800853..40b5955 100644
|
||||
--- a/libiscsi/pylibiscsi.c
|
||||
+++ b/libiscsi/pylibiscsi.c
|
||||
@@ -364,8 +364,13 @@ static PyObject *PyIscsiNode_str(PyObject *self)
|
||||
|
@ -52,5 +52,5 @@ index 88008538f04f..40b59553a28e 100644
|
|||
libiscsi_get_error_string(context));
|
||||
return NULL;
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
From 7671cd56d36a76e954318cbdce3f08fc40aa3fe4 Mon Sep 17 00:00:00 2001
|
||||
From 2c28c620727e522f022689312d76f107eb8ef18f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Hatina <phatina@redhat.com>
|
||||
Date: Mon, 5 Oct 2015 16:50:36 -0700
|
||||
Subject: [PATCH 19/32] libiscsi introduce sessions API
|
||||
Subject: [PATCH] libiscsi introduce sessions API
|
||||
|
||||
---
|
||||
libiscsi/libiscsi.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
libiscsi/libiscsi.h | 56 +++++++++++++++++++++++
|
||||
libiscsi/libiscsi.c | 125 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
libiscsi/libiscsi.h | 56 ++++++++++++++++++++
|
||||
usr/iscsi_sysfs.c | 6 +++
|
||||
usr/iscsi_sysfs.h | 2 +
|
||||
4 files changed, 189 insertions(+)
|
||||
|
||||
diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
|
||||
index 064e4b570d0b..755c18ca8e3b 100644
|
||||
index 064e4b5..755c18c 100644
|
||||
--- a/libiscsi/libiscsi.c
|
||||
+++ b/libiscsi/libiscsi.c
|
||||
@@ -3,6 +3,7 @@
|
||||
|
@ -154,7 +154,7 @@ index 064e4b570d0b..755c18ca8e3b 100644
|
|||
const struct libiscsi_node *node,
|
||||
const char *parameter, const char *value)
|
||||
diff --git a/libiscsi/libiscsi.h b/libiscsi/libiscsi.h
|
||||
index 756590e14d8b..a9891f48b7d6 100644
|
||||
index 756590e..a9891f4 100644
|
||||
--- a/libiscsi/libiscsi.h
|
||||
+++ b/libiscsi/libiscsi.h
|
||||
@@ -3,6 +3,7 @@
|
||||
|
@ -242,7 +242,7 @@ index 756590e14d8b..a9891f48b7d6 100644
|
|||
*
|
||||
* Set the given nodes iSCSI parameter named by \e parameter to value \e value.
|
||||
diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
|
||||
index fdc26c7bd9ba..80b7b0210fd1 100644
|
||||
index 435c576..e549afe 100644
|
||||
--- a/usr/iscsi_sysfs.c
|
||||
+++ b/usr/iscsi_sysfs.c
|
||||
@@ -3,6 +3,7 @@
|
||||
|
@ -253,7 +253,7 @@ index fdc26c7bd9ba..80b7b0210fd1 100644
|
|||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published
|
||||
@@ -1146,6 +1147,11 @@ free_info:
|
||||
@@ -1151,6 +1152,11 @@ free_info:
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
@ -266,7 +266,7 @@ index fdc26c7bd9ba..80b7b0210fd1 100644
|
|||
int *nr_found,
|
||||
iscsi_sysfs_iface_op_fn *fn)
|
||||
diff --git a/usr/iscsi_sysfs.h b/usr/iscsi_sysfs.h
|
||||
index cdcefa65f683..12ad87f96c8c 100644
|
||||
index 1d0377f..909db34 100644
|
||||
--- a/usr/iscsi_sysfs.h
|
||||
+++ b/usr/iscsi_sysfs.h
|
||||
@@ -3,6 +3,7 @@
|
||||
|
@ -286,5 +286,5 @@ index cdcefa65f683..12ad87f96c8c 100644
|
|||
int *nr_found,
|
||||
iscsi_sysfs_iface_op_fn *fn);
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
From 1aa35262d566d829d711bc746f944dee5c2d9e7a Mon Sep 17 00:00:00 2001
|
||||
From c53c576c09c5a3a1654b7a1f08fcc222a102499d Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Tue, 28 Feb 2017 09:00:41 -0800
|
||||
Subject: [PATCH 21/32] libiscsi: fix discovery request timeout regression
|
||||
Subject: [PATCH] libiscsi: fix discovery request timeout regression
|
||||
|
||||
---
|
||||
libiscsi/libiscsi.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
|
||||
index 755c18ca8e3b..bb17dfcafded 100644
|
||||
index 755c18c..bb17dfc 100644
|
||||
--- a/libiscsi/libiscsi.c
|
||||
+++ b/libiscsi/libiscsi.c
|
||||
@@ -136,6 +136,7 @@ int libiscsi_discover_sendtargets(struct libiscsi_context *context,
|
||||
|
@ -28,5 +28,5 @@ index 755c18ca8e3b..bb17dfcafded 100644
|
|||
rc = idbm_bind_ifaces_to_nodes(discovery_fw, &drec, &ifaces, &rec_list);
|
||||
if (rc) {
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
From 1b2b6b683bd7ca3a7030889daf8c326dda797319 Mon Sep 17 00:00:00 2001
|
||||
From cf4db608004f7c1f137ed556e3ba6b6f4d65da96 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Tue, 28 Feb 2017 10:06:42 -0800
|
||||
Subject: [PATCH 22/32] libiscsi format-security build errors
|
||||
Subject: [PATCH] libiscsi format-security build errors
|
||||
|
||||
---
|
||||
libiscsi/libiscsi.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
|
||||
index bb17dfcafded..7003388e3346 100644
|
||||
index bb17dfc..7003388 100644
|
||||
--- a/libiscsi/libiscsi.c
|
||||
+++ b/libiscsi/libiscsi.c
|
||||
@@ -177,7 +177,8 @@ int libiscsi_discover_sendtargets(struct libiscsi_context *context,
|
||||
|
@ -31,5 +31,5 @@ index bb17dfcafded..7003388e3346 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
From b0d26441cebf6f1d78a2b4523ee9c348578b3d91 Mon Sep 17 00:00:00 2001
|
||||
From a86a677762cf5fd45a43029a4fd3dd83d1a87a98 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Thu, 24 May 2018 15:17:05 -0700
|
||||
Subject: [PATCH 23/32] libiscsi fix build to use libopeniscsiusr
|
||||
Subject: [PATCH] libiscsi fix build to use libopeniscsiusr
|
||||
|
||||
---
|
||||
libiscsi/Makefile | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libiscsi/Makefile b/libiscsi/Makefile
|
||||
index 317a7ec4db30..1196bb5c0cf4 100644
|
||||
index 53f9746..f2cf248 100644
|
||||
--- a/libiscsi/Makefile
|
||||
+++ b/libiscsi/Makefile
|
||||
@@ -4,7 +4,9 @@ OSNAME=$(shell uname -s)
|
||||
@@ -8,7 +8,9 @@ OSNAME=$(shell uname -s)
|
||||
OPTFLAGS ?= -O2 -g
|
||||
WARNFLAGS ?= -Wall -Wstrict-prototypes
|
||||
CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
|
||||
|
@ -22,7 +22,7 @@ index 317a7ec4db30..1196bb5c0cf4 100644
|
|||
LIB = libiscsi.so.0
|
||||
TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
|
||||
TESTS += tests/test_login tests/test_logout tests/test_params
|
||||
@@ -19,7 +21,7 @@ FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sys
|
||||
@@ -23,7 +25,7 @@ FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sys
|
||||
# sources shared with the userspace utils, note we build these separately
|
||||
# to get PIC versions.
|
||||
COMMON_OBJS = $(patsubst %.o, common-objs/%.o, $(COMMON_SRCS))
|
||||
|
@ -32,5 +32,5 @@ index 317a7ec4db30..1196bb5c0cf4 100644
|
|||
|
||||
# Flags for the tests
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -0,0 +1,66 @@
|
|||
From 55af753f593243bcd1ab4c7e82620bdee432915b Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Thu, 7 Nov 2019 09:16:17 -0800
|
||||
Subject: [PATCH] libiscsi: fix build against latest upstream, again
|
||||
|
||||
---
|
||||
libiscsi/Makefile | 4 ++--
|
||||
libiscsi/libiscsi.c | 6 +++---
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libiscsi/Makefile b/libiscsi/Makefile
|
||||
index f2cf248..462d666 100644
|
||||
--- a/libiscsi/Makefile
|
||||
+++ b/libiscsi/Makefile
|
||||
@@ -10,7 +10,7 @@ WARNFLAGS ?= -Wall -Wstrict-prototypes
|
||||
CFLAGS = $(OPTFLAGS) $(WARNFLAGS) -I../include -I../usr \
|
||||
-D$(OSNAME) -fPIC -D_GNU_SOURCE -fvisibility=hidden \
|
||||
-I../libopeniscsiusr
|
||||
-LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr
|
||||
+LDFLAGS = -L../libopeniscsiusr -lopeniscsiusr -lkmod -lcrypto
|
||||
LIB = libiscsi.so.0
|
||||
TESTS = tests/test_discovery_sendtargets tests/test_discovery_firmware
|
||||
TESTS += tests/test_login tests/test_logout tests/test_params
|
||||
@@ -19,7 +19,7 @@ TESTS += tests/test_set_auth tests/test_get_auth
|
||||
|
||||
COMMON_SRCS = sysdeps.o
|
||||
# sources shared between iscsid, iscsiadm and iscsistart
|
||||
-ISCSI_LIB_SRCS = netlink.o transport.o cxgbi.o be2iscsi.o iscsi_timer.o initiator_common.o iscsi_err.o session_info.o iscsi_util.o io.o auth.o discovery.o login.o log.o md5.o sha1.o iface.o idbm.o sysfs.o iscsi_sysfs.o iscsi_net_util.o iscsid_req.o iser.o uip_mgmt_ipc.o
|
||||
+ISCSI_LIB_SRCS = netlink.o transport.o cxgbi.o be2iscsi.o iscsi_timer.o initiator_common.o iscsi_err.o session_info.o iscsi_util.o io.o auth.o discovery.o login.o log.o iface.o idbm.o sysfs.o iscsi_sysfs.o iscsi_net_util.o iscsid_req.o iser.o uip_mgmt_ipc.o
|
||||
FW_PARAM_SRCS = fw_entry.o prom_lex.o prom_parse.tab.o fwparam_ppc.o fwparam_sysfs.o
|
||||
|
||||
# sources shared with the userspace utils, note we build these separately
|
||||
diff --git a/libiscsi/libiscsi.c b/libiscsi/libiscsi.c
|
||||
index 7003388..c598aee 100644
|
||||
--- a/libiscsi/libiscsi.c
|
||||
+++ b/libiscsi/libiscsi.c
|
||||
@@ -429,7 +429,7 @@ int libiscsi_node_login(struct libiscsi_context *context,
|
||||
|
||||
CHECK(idbm_for_each_iface(&nr_found, (void*)node->iface, login_helper,
|
||||
(char *)node->name, node->tpgt,
|
||||
- (char *)node->address, node->port))
|
||||
+ (char *)node->address, node->port, false))
|
||||
if (nr_found == 0) {
|
||||
strcpy(context->error_str, "No such node");
|
||||
rc = ENODEV;
|
||||
@@ -615,7 +615,7 @@ int libiscsi_node_set_parameter(struct libiscsi_context *context,
|
||||
|
||||
CHECK(idbm_for_each_iface(&nr_found, ¶ms, idbm_node_set_param,
|
||||
(char *)node->name, node->tpgt,
|
||||
- (char *)node->address, node->port))
|
||||
+ (char *)node->address, node->port, false))
|
||||
if (nr_found == 0) {
|
||||
strcpy(context->error_str, "No such node");
|
||||
rc = ENODEV;
|
||||
@@ -677,7 +677,7 @@ int libiscsi_node_get_parameter(struct libiscsi_context *context,
|
||||
as most settings should be the same independent of the iface. */
|
||||
CHECK(idbm_for_each_iface(&nr_found, context, get_parameter_helper,
|
||||
(char *)node->name, node->tpgt,
|
||||
- (char *)node->address, node->port))
|
||||
+ (char *)node->address, node->port, false))
|
||||
if (nr_found == 0) {
|
||||
strcpy(context->error_str, "No such node");
|
||||
rc = ENODEV;
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -1,17 +1,17 @@
|
|||
From 71b576b10a03651f67173d19883a929e91a3423a Mon Sep 17 00:00:00 2001
|
||||
From d410fe4b6eb2347f2160b8aaab24a639de99c23c Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Mon, 19 Nov 2012 17:09:24 -0800
|
||||
Subject: [PATCH 10/32] remove the offload boot supported ifdef
|
||||
Subject: [PATCH] remove the offload boot supported ifdef
|
||||
|
||||
---
|
||||
usr/iface.c | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/usr/iface.c b/usr/iface.c
|
||||
index 137138f5af67..889fe8cd8202 100644
|
||||
index 11f3d2a..65c1615 100644
|
||||
--- a/usr/iface.c
|
||||
+++ b/usr/iface.c
|
||||
@@ -993,6 +993,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
|
||||
@@ -998,6 +998,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
|
||||
{
|
||||
struct iscsi_transport *t = NULL;
|
||||
uint32_t hostno;
|
||||
|
@ -19,7 +19,7 @@ index 137138f5af67..889fe8cd8202 100644
|
|||
|
||||
if (strlen(context->initiatorname))
|
||||
strlcpy(iface->iname, context->initiatorname,
|
||||
@@ -1006,10 +1007,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
|
||||
@@ -1011,10 +1012,7 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
|
||||
return 0;
|
||||
}
|
||||
} else if (strlen(context->iface)) {
|
||||
|
@ -30,7 +30,7 @@ index 137138f5af67..889fe8cd8202 100644
|
|||
|
||||
memset(transport_name, 0, ISCSI_TRANSPORT_NAME_MAXLEN);
|
||||
/* make sure offload driver is loaded */
|
||||
@@ -1035,9 +1033,6 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
|
||||
@@ -1040,9 +1038,6 @@ int iface_setup_from_boot_context(struct iface_rec *iface,
|
||||
}
|
||||
|
||||
strlcpy(iface->netdev, context->iface, sizeof(iface->netdev));
|
||||
|
@ -41,5 +41,5 @@ index 137138f5af67..889fe8cd8202 100644
|
|||
return 0;
|
||||
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 6629618e3581cbe632b7408a49437270bc04a8d4 Mon Sep 17 00:00:00 2001
|
||||
From 49dc2a687175f9671a159df38971a15287dae18c Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Mon, 24 Feb 2014 09:33:33 -0800
|
||||
Subject: [PATCH 13/32] Revert "iscsiadm: return error when login fails"
|
||||
Subject: [PATCH] Revert "iscsiadm: return error when login fails"
|
||||
|
||||
This reverts commit fc2a8e9a2911bc76f961fe3e4a159fab9b8b9691.
|
||||
|
||||
|
@ -11,7 +11,7 @@ Done to address RHBZ #1015563
|
|||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/usr/session_mgmt.c b/usr/session_mgmt.c
|
||||
index 596085b1f640..07f587d2bafb 100644
|
||||
index 0500f15..1e1f2bc 100644
|
||||
--- a/usr/session_mgmt.c
|
||||
+++ b/usr/session_mgmt.c
|
||||
@@ -178,12 +178,12 @@ int iscsi_login_portal(void *data, struct list_head *list, struct node_rec *rec)
|
||||
|
@ -30,5 +30,5 @@ index 596085b1f640..07f587d2bafb 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,19 +1,19 @@
|
|||
From 09485b397990aca06d5e98a855bab2444c9ec572 Mon Sep 17 00:00:00 2001
|
||||
From e35261316aaa598c4146a5396745cb76571e94fe Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Fri, 25 May 2018 09:39:07 -0700
|
||||
Subject: [PATCH 24/32] dont install scripts
|
||||
Subject: [PATCH] dont install scripts
|
||||
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 80afe86d6558..a35082daa9f9 100644
|
||||
index 4ab091f..7e6b734 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -99,7 +99,7 @@ install_udev_rules:
|
||||
$(INSTALL) -d $(DESTDIR)$(rulesdir)
|
||||
$(INSTALL) -m 644 $(RULESFILES) $(DESTDIR)/$(rulesdir)
|
||||
@@ -116,7 +116,7 @@ install_systemd:
|
||||
$(INSTALL) -d $(DESTDIR)$(systemddir)
|
||||
$(INSTALL) -m 644 $(SYSTEMDFILES) $(DESTDIR)/$(systemddir)
|
||||
|
||||
-install_programs: $(PROGRAMS) $(SCRIPTS)
|
||||
+install_programs: $(PROGRAMS) # $(SCRIPTS)
|
||||
|
@ -21,5 +21,5 @@ index 80afe86d6558..a35082daa9f9 100644
|
|||
$(INSTALL) -m 755 $^ $(DESTDIR)$(sbindir)
|
||||
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 089cd6910d9f0d1e459e1d8d00b754843437526d Mon Sep 17 00:00:00 2001
|
||||
From e186e959ddc2a47e7cfe1f5a8ea4d3fa8248a478 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Wed, 30 May 2018 16:08:30 -0700
|
||||
Subject: [PATCH 28/28] use /var/lib/iscsi in libopeniscsiusr
|
||||
Subject: [PATCH] use /var/lib/iscsi in libopeniscsiusr
|
||||
|
||||
---
|
||||
libopeniscsiusr/idbm.h | 3 ++-
|
||||
|
@ -12,7 +12,7 @@ Subject: [PATCH 28/28] use /var/lib/iscsi in libopeniscsiusr
|
|||
5 files changed, 9 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libopeniscsiusr/idbm.h b/libopeniscsiusr/idbm.h
|
||||
index 3fd0864a797d..c84d332ff949 100644
|
||||
index cc90388..5a4d2fa 100644
|
||||
--- a/libopeniscsiusr/idbm.h
|
||||
+++ b/libopeniscsiusr/idbm.h
|
||||
@@ -31,7 +31,8 @@
|
||||
|
@ -26,10 +26,10 @@ index 3fd0864a797d..c84d332ff949 100644
|
|||
#define BOOT_NAME_MAXLEN 256
|
||||
#define IDBM_DUMP_SIZE 8192
|
||||
diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c
|
||||
index e2355bc0fff0..cd9dd7326ae6 100644
|
||||
index e7938a5..99ab7b5 100644
|
||||
--- a/libopeniscsiusr/iface.c
|
||||
+++ b/libopeniscsiusr/iface.c
|
||||
@@ -383,7 +383,7 @@ int iscsi_default_iface_setup(struct iscsi_context *ctx)
|
||||
@@ -381,7 +381,7 @@ int iscsi_default_iface_setup(struct iscsi_context *ctx)
|
||||
|
||||
_good(_iscsi_hids_get(ctx, &hids, &hid_count), rc, out);
|
||||
for (i = 0; i < hid_count; ++i) {
|
||||
|
@ -39,7 +39,7 @@ index e2355bc0fff0..cd9dd7326ae6 100644
|
|||
_good(_iscsi_ifaces_get_from_sysfs(ctx, hids[i], &ifaces, &iface_count),
|
||||
rc, out);
|
||||
diff --git a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h
|
||||
index 439590249212..81582da9e1e6 100644
|
||||
index 4395902..81582da 100644
|
||||
--- a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h
|
||||
+++ b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr.h
|
||||
@@ -339,7 +339,7 @@ __DLL_EXPORT void iscsi_session_free(struct iscsi_session *se);
|
||||
|
@ -79,7 +79,7 @@ index 439590249212..81582da9e1e6 100644
|
|||
* by assert.
|
||||
* @iface:
|
||||
diff --git a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h
|
||||
index a1a255246d20..95b01602fb37 100644
|
||||
index a1a2552..95b0160 100644
|
||||
--- a/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h
|
||||
+++ b/libopeniscsiusr/libopeniscsiusr/libopeniscsiusr_iface.h
|
||||
@@ -182,7 +182,7 @@ __DLL_EXPORT const char *iscsi_iface_name_get(struct iscsi_iface *iface);
|
||||
|
@ -92,7 +92,7 @@ index a1a255246d20..95b01602fb37 100644
|
|||
* @iface:
|
||||
* Pointer of 'struct iscsi_iface'.
|
||||
diff --git a/libopeniscsiusr/node.h b/libopeniscsiusr/node.h
|
||||
index 39e07b3befae..9eba7fa6077c 100644
|
||||
index 39e07b3..9eba7fa 100644
|
||||
--- a/libopeniscsiusr/node.h
|
||||
+++ b/libopeniscsiusr/node.h
|
||||
@@ -44,7 +44,7 @@ struct iscsi_node {
|
||||
|
@ -105,5 +105,5 @@ index 39e07b3befae..9eba7fa6077c 100644
|
|||
/* Might be public in the future */
|
||||
__DLL_LOCAL void iscsi_node_free(struct iscsi_node *node);
|
||||
--
|
||||
2.14.4
|
||||
2.26.2
|
||||
|
|
@ -1,21 +1,21 @@
|
|||
From f8e7499e9f69465668fc6e5e7bcfb9ce09e8a457 Mon Sep 17 00:00:00 2001
|
||||
From c455d7ff3a2fa37cdd5b43616db975aef336a007 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Wed, 5 Jun 2019 09:08:39 -0700
|
||||
Subject: [PATCH] Coverity scan fixes
|
||||
Subject: [PATCH 1/1] Coverity scan fixes
|
||||
|
||||
---
|
||||
iscsiuio/src/unix/libs/qedi.c | 2 +-
|
||||
iscsiuio/src/unix/main.c | 12 ++++++++++--
|
||||
iscsiuio/src/unix/main.c | 3 +++
|
||||
libopeniscsiusr/idbm.c | 11 +++++------
|
||||
usr/idbm.c | 10 ++++------
|
||||
usr/iscsid.c | 2 +-
|
||||
5 files changed, 21 insertions(+), 16 deletions(-)
|
||||
5 files changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c
|
||||
index b7595d5..47300b0 100644
|
||||
index 1af8d1b..9a814c6 100644
|
||||
--- a/iscsiuio/src/unix/libs/qedi.c
|
||||
+++ b/iscsiuio/src/unix/libs/qedi.c
|
||||
@@ -1023,7 +1023,7 @@ static int qedi_read(nic_t *nic, packet_t *pkt)
|
||||
@@ -1030,7 +1030,7 @@ static int qedi_read(nic_t *nic, packet_t *pkt)
|
||||
|
||||
LOG_DEBUG(PFX "%s:hw_prod %d bd_prod %d, rx_pkt_idx %d, rxlen %d",
|
||||
nic->log_name, hw_prod, bd_prod, rx_bd->rx_pkt_index, len);
|
||||
|
@ -25,22 +25,10 @@ index b7595d5..47300b0 100644
|
|||
|
||||
if (bd_cons != bd_prod) {
|
||||
diff --git a/iscsiuio/src/unix/main.c b/iscsiuio/src/unix/main.c
|
||||
index 5168e4e..ed41931 100644
|
||||
index 0c9ad49..f83f305 100644
|
||||
--- a/iscsiuio/src/unix/main.c
|
||||
+++ b/iscsiuio/src/unix/main.c
|
||||
@@ -340,7 +340,10 @@ int main(int argc, char *argv[])
|
||||
|
||||
/* parent: wait for child msg then exit */
|
||||
close(pipefds[1]);
|
||||
- read(pipefds[0], msgbuf, sizeof(msgbuf));
|
||||
+ if (read(pipefds[0], msgbuf, sizeof(msgbuf)) < 0) {
|
||||
+ fprintf(stderr, "ERR: Waiting for child process failed\n");
|
||||
+ exit(1);
|
||||
+ }
|
||||
exit(0);
|
||||
}
|
||||
|
||||
@@ -386,6 +389,9 @@ int main(int argc, char *argv[])
|
||||
@@ -391,6 +391,9 @@ int main(int argc, char *argv[])
|
||||
sigaddset(&set, SIGTERM);
|
||||
sigaddset(&set, SIGUSR1);
|
||||
rc = pthread_sigmask(SIG_SETMASK, &set, NULL);
|
||||
|
@ -50,32 +38,21 @@ index 5168e4e..ed41931 100644
|
|||
|
||||
/* Spin off the signal handling thread */
|
||||
pthread_attr_init(&attr);
|
||||
@@ -415,7 +421,9 @@ int main(int argc, char *argv[])
|
||||
if (!foreground) {
|
||||
/* signal parent they can go away now */
|
||||
close(pipefds[0]);
|
||||
- write(pipefds[1], "ok\n", 3);
|
||||
+ if (write(pipefds[1], "ok\n", 3) < 0) {
|
||||
+ LOG_ERR("Failed to signal parent process of completed initialization");
|
||||
+ }
|
||||
close(pipefds[1]);
|
||||
}
|
||||
|
||||
diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
|
||||
index d020e6c..342aab5 100644
|
||||
index 0910c63..6213e62 100644
|
||||
--- a/libopeniscsiusr/idbm.c
|
||||
+++ b/libopeniscsiusr/idbm.c
|
||||
@@ -287,12 +287,11 @@ int _idbm_lock(struct iscsi_context *ctx)
|
||||
@@ -321,12 +321,11 @@ int _idbm_lock(struct iscsi_context *ctx)
|
||||
return 0;
|
||||
}
|
||||
|
||||
- if (access(LOCK_DIR, F_OK) != 0) {
|
||||
- if (mkdir(LOCK_DIR, 0660) != 0) {
|
||||
- if (mkdir(LOCK_DIR, 0770) != 0) {
|
||||
- _error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno,
|
||||
- _strerror(errno, strerr_buff));
|
||||
- return LIBISCSI_ERR_IDBM;
|
||||
- }
|
||||
+ if (((mkdir(LOCK_DIR, 0660) != 0) && (errno != EEXIST)) ||
|
||||
+ if (((mkdir(LOCK_DIR, 0770) != 0) && (errno != EEXIST)) ||
|
||||
+ (access(LOCK_DIR, F_OK) != 0)) {
|
||||
+ _error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno,
|
||||
+ _strerror(errno, strerr_buff));
|
||||
|
@ -84,20 +61,20 @@ index d020e6c..342aab5 100644
|
|||
|
||||
fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666);
|
||||
diff --git a/usr/idbm.c b/usr/idbm.c
|
||||
index 89a6c27..a3343fe 100644
|
||||
index b33ae42..1ac0b73 100644
|
||||
--- a/usr/idbm.c
|
||||
+++ b/usr/idbm.c
|
||||
@@ -1332,12 +1332,10 @@ int idbm_lock(void)
|
||||
@@ -1461,12 +1461,10 @@ int idbm_lock(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
- if (access(LOCK_DIR, F_OK) != 0) {
|
||||
- if (mkdir(LOCK_DIR, 0660) != 0) {
|
||||
- if (mkdir(LOCK_DIR, 0770) != 0) {
|
||||
- log_error("Could not open %s: %s", LOCK_DIR,
|
||||
- strerror(errno));
|
||||
- return ISCSI_ERR_IDBM;
|
||||
- }
|
||||
+ if (((mkdir(LOCK_DIR, 0660) != 0) && (errno != EEXIST)) ||
|
||||
+ if (((mkdir(LOCK_DIR, 0770) != 0) && (errno != EEXIST)) ||
|
||||
+ (access(LOCK_DIR, F_OK) != 0)) {
|
||||
+ log_error("Could not open %s: %s", LOCK_DIR, strerror(errno));
|
||||
+ return ISCSI_ERR_IDBM;
|
||||
|
@ -105,10 +82,10 @@ index 89a6c27..a3343fe 100644
|
|||
|
||||
fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666);
|
||||
diff --git a/usr/iscsid.c b/usr/iscsid.c
|
||||
index 37c13b3..1891784 100644
|
||||
index dc54fec..fde8894 100644
|
||||
--- a/usr/iscsid.c
|
||||
+++ b/usr/iscsid.c
|
||||
@@ -489,8 +489,8 @@ int main(int argc, char *argv[])
|
||||
@@ -510,8 +510,8 @@ int main(int argc, char *argv[])
|
||||
log_close(log_pid);
|
||||
exit(ISCSI_ERR);
|
||||
}
|
||||
|
@ -119,5 +96,5 @@ index 37c13b3..1891784 100644
|
|||
if ((control_fd = ipc->ctldev_open()) < 0) {
|
||||
log_close(log_pid);
|
||||
--
|
||||
2.21.0
|
||||
2.31.1
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 8bcaf32662ff762c2cab3d4b1f96c38965304e30 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Wed, 16 Oct 2019 23:17:20 -0700
|
||||
Subject: [PATCH 1/1] fix upstream build breakage of iscsiuio LDFLAGS
|
||||
|
||||
---
|
||||
iscsiuio/configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/iscsiuio/configure.ac b/iscsiuio/configure.ac
|
||||
index 9b85448..1b9fb27 100644
|
||||
--- a/iscsiuio/configure.ac
|
||||
+++ b/iscsiuio/configure.ac
|
||||
@@ -72,7 +72,7 @@ AC_ARG_WITH([systemd],
|
||||
*) AC_MSG_ERROR([bad value $withval for --with-systemd]) ;;
|
||||
esac],[with_libsystemd=auto])
|
||||
AS_IF([test "$with_libsystemd" != no],[
|
||||
- PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS=$LIBSYSTEMD_LIBS],[
|
||||
+ PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[LDFLAGS="${LDFLAGS} $LIBSYSTEMD_LIBS"],[
|
||||
if test "$with_libsystemd" = yes; then
|
||||
AC_MSG_ERROR([could not find libsystemd using pkg-config])
|
||||
else
|
||||
--
|
||||
2.31.1
|
||||
|
|
@ -1,25 +1,25 @@
|
|||
From 92aac85cf423d1c566d324255a86de0116d33015 Mon Sep 17 00:00:00 2001
|
||||
From a7c0b325c7ce5c4bd72ddcf7022f42bd8cfc9e90 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Mon, 21 Jan 2013 15:43:36 -0800
|
||||
Subject: [PATCH 20/32] use Red Hat version string to match RPM package version
|
||||
Subject: [PATCH 1/1] use Red Hat version string to match RPM package version
|
||||
|
||||
---
|
||||
usr/version.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/usr/version.h b/usr/version.h
|
||||
index 4dfef4ccfb77..1334d47c6bb3 100644
|
||||
index 3c68989..31b6f05 100644
|
||||
--- a/usr/version.h
|
||||
+++ b/usr/version.h
|
||||
@@ -6,7 +6,7 @@
|
||||
* This may not be the same value as the kernel versions because
|
||||
* some other maintainer could merge a patch without going through us
|
||||
*/
|
||||
-#define ISCSI_VERSION_STR "2.0-877"
|
||||
+#define ISCSI_VERSION_STR "6.2.0.877-0"
|
||||
-#define ISCSI_VERSION_STR "2.1.4"
|
||||
+#define ISCSI_VERSION_STR "6.2.1.4-1"
|
||||
#define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version"
|
||||
|
||||
#endif
|
||||
--
|
||||
2.14.4
|
||||
2.31.1
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
From 84a8601fe7b9b5337af95835aaa5aae1bfd88d95 Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Tue, 11 Aug 2020 21:00:29 +0200
|
||||
Subject: [PATCH] iscsi_if.h replace zero-length array with flexible-array
|
||||
member
|
||||
|
||||
---
|
||||
include/iscsi_if.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/include/iscsi_if.h b/include/iscsi_if.h
|
||||
index 5a1c614..e8cee0d 100644
|
||||
--- a/include/iscsi_if.h
|
||||
+++ b/include/iscsi_if.h
|
||||
@@ -337,7 +337,7 @@ enum iscsi_param_type {
|
||||
struct iscsi_param_info {
|
||||
uint32_t len; /* Actual length of the param value */
|
||||
uint16_t param; /* iscsi param */
|
||||
- uint8_t value[0]; /* length sized value follows */
|
||||
+ uint8_t value[]; /* length sized value follows */
|
||||
} __attribute__((__packed__));
|
||||
|
||||
struct iscsi_iface_param_info {
|
||||
@@ -346,7 +346,7 @@ struct iscsi_iface_param_info {
|
||||
uint16_t param; /* iscsi param value */
|
||||
uint8_t iface_type; /* IPv4 or IPv6 */
|
||||
uint8_t param_type; /* iscsi_param_type */
|
||||
- uint8_t value[0]; /* length sized value follows */
|
||||
+ uint8_t value[]; /* length sized value follows */
|
||||
} __attribute__((__packed__));
|
||||
|
||||
/*
|
||||
@@ -723,7 +723,7 @@ enum iscsi_flashnode_param {
|
||||
struct iscsi_flashnode_param_info {
|
||||
uint32_t len; /* Actual length of the param */
|
||||
uint16_t param; /* iscsi param value */
|
||||
- uint8_t value[0]; /* length sized value follows */
|
||||
+ uint8_t value[]; /* length sized value follows */
|
||||
} __attribute__((__packed__));
|
||||
|
||||
enum iscsi_discovery_parent_type {
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
From af428f588f8023784c6f4b0a25d13b70fb7216ab Mon Sep 17 00:00:00 2001
|
||||
From: rpm-build <rpm-build>
|
||||
Date: Tue, 3 Mar 2020 10:35:40 -0800
|
||||
Subject: [PATCH] stop using Werror for now
|
||||
|
||||
need to work through these warning that only appear on s390x
|
||||
Werror seems bad for release, makes packaging a nightmare when new
|
||||
compilers come around
|
||||
---
|
||||
Makefile | 2 +-
|
||||
usr/Makefile | 2 +-
|
||||
usr/initiator.c | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7e6b734..0069e75 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -7,7 +7,7 @@
|
||||
DESTDIR ?=
|
||||
|
||||
prefix = /usr
|
||||
-exec_prefix = /
|
||||
+exec_prefix = /usr
|
||||
sbindir = $(exec_prefix)/sbin
|
||||
bindir = $(exec_prefix)/bin
|
||||
mandir = $(prefix)/share/man
|
||||
diff --git a/usr/Makefile b/usr/Makefile
|
||||
index 885243a..1a743d1 100644
|
||||
--- a/usr/Makefile
|
||||
+++ b/usr/Makefile
|
||||
@@ -35,7 +35,7 @@ endif
|
||||
PKG_CONFIG = /usr/bin/pkg-config
|
||||
|
||||
CFLAGS ?= -O2 -g
|
||||
-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
|
||||
+WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
|
||||
CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
|
||||
-I$(TOPDIR)/libopeniscsiusr -DISNS_ENABLE
|
||||
CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
|
||||
diff --git a/usr/initiator.c b/usr/initiator.c
|
||||
index 684647c..a5a9d08 100644
|
||||
--- a/usr/initiator.c
|
||||
+++ b/usr/initiator.c
|
||||
@@ -580,7 +580,7 @@ __session_conn_reopen(iscsi_conn_t *conn, queue_task_t *qtask, int do_stop,
|
||||
int redirected)
|
||||
{
|
||||
iscsi_session_t *session = conn->session;
|
||||
- uint32_t delay;
|
||||
+ uint32_t delay = 0;
|
||||
|
||||
log_debug(1, "re-opening session %d (reopen_cnt %d)", session->id,
|
||||
session->reopen_cnt);
|
||||
--
|
||||
2.26.2
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From b9bf7cea4769efa73e6de9b13a8d1833d2ac3d92 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Leech <cleech@redhat.com>
|
||||
Date: Wed, 16 Jun 2021 09:55:06 -0700
|
||||
Subject: [PATCH 1/1] iscsistart: fix null pointer deref before exit
|
||||
|
||||
Fixes regression caused by "open-iscsi: Clean user_param list when
|
||||
process exit" Which is a shame, as not freeing a memory at process exit
|
||||
doesn't really hurt anything.
|
||||
|
||||
Same change as "Fix iscsiadm segfault when exiting" applied to iscsiadm.
|
||||
|
||||
Fixes: b532ad67d495d42026165a26515c645995d23f18
|
||||
Signed-off-by: Chris Leech <cleech@redhat.com>
|
||||
---
|
||||
usr/iscsistart.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/usr/iscsistart.c b/usr/iscsistart.c
|
||||
index 206cd4c..7eb573e 100644
|
||||
--- a/usr/iscsistart.c
|
||||
+++ b/usr/iscsistart.c
|
||||
@@ -361,7 +361,7 @@ int main(int argc, char *argv[])
|
||||
struct boot_context *context, boot_context;
|
||||
struct sigaction sa_old;
|
||||
struct sigaction sa_new;
|
||||
- struct user_param *param;
|
||||
+ struct user_param *param, *tmp_param;
|
||||
int control_fd, mgmt_ipc_fd, err;
|
||||
pid_t pid;
|
||||
|
||||
@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
|
||||
mgmt_ipc_close(mgmt_ipc_fd);
|
||||
free_initiator();
|
||||
sysfs_cleanup();
|
||||
- list_for_each_entry(param, &user_params, list) {
|
||||
+ list_for_each_entry_safe(param, tmp_param, &user_params, list) {
|
||||
list_del(¶m->list);
|
||||
idbm_free_user_param(param);
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
%global open_iscsi_version 2.0
|
||||
%global open_iscsi_build 877
|
||||
%global commit0 f71581bd641dc26d330cb8b97e5ec272dd08f811
|
||||
%global open_iscsi_version 2.1
|
||||
%global open_iscsi_build 4
|
||||
%global commit0 095f59ca464220eae285de6b5f2ee31185a6a84c
|
||||
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
|
||||
|
||||
%if 0%{?rhel} > 7
|
||||
|
@ -13,7 +13,7 @@
|
|||
Summary: iSCSI daemon and utility programs
|
||||
Name: iscsi-initiator-utils
|
||||
Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
|
||||
Release: 1.git%{shortcommit0}%{?dist}
|
||||
Release: 8.git%{shortcommit0}%{?dist}
|
||||
Group: System Environment/Daemons
|
||||
License: GPLv2+
|
||||
URL: http://www.open-iscsi.org
|
||||
|
@ -21,37 +21,43 @@ Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/ope
|
|||
Source4: 04-iscsi
|
||||
Source5: iscsi-tmpfiles.conf
|
||||
|
||||
Patch0001: 0001-service-file-tweaks.patch
|
||||
Patch0002: 0001-fix-iscsiuio-build-with-libsystemd.patch
|
||||
Patch0003: 0001-idmb_rec_write-check-for-tpgt-first.patch
|
||||
Patch0004: 0002-idbm_rec_write-seperate-old-and-new-style-writes.patch
|
||||
Patch0005: 0003-idbw_rec_write-pick-tpgt-from-existing-record.patch
|
||||
Patch0006: 0006-update-initscripts-and-docs.patch
|
||||
Patch0007: 0007-use-var-for-config.patch
|
||||
Patch0008: 0008-use-red-hat-for-name.patch
|
||||
Patch0009: 0009-libiscsi.patch
|
||||
Patch0010: 0010-remove-the-offload-boot-supported-ifdef.patch
|
||||
Patch0011: 0013-Revert-iscsiadm-return-error-when-login-fails.patch
|
||||
Patch0012: 0018-Add-macros-to-release-GIL-lock.patch
|
||||
Patch0013: 0019-libiscsi-introduce-sessions-API.patch
|
||||
Patch0014: 0020-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
|
||||
Patch0015: 0021-libiscsi-fix-discovery-request-timeout-regression.patch
|
||||
Patch0016: 0022-libiscsi-format-security-build-errors.patch
|
||||
Patch0017: 0023-libiscsi-fix-build-to-use-libopeniscsiusr.patch
|
||||
Patch0018: 0024-dont-install-scripts.patch
|
||||
Patch0019: 0028-use-var-lib-iscsi-in-libopeniscsiusr.patch
|
||||
Patch0099: 0001-Coverity-scan-fixes.patch
|
||||
Patch0001: 0001-unit-file-tweaks.patch
|
||||
Patch0002: 0002-idmb_rec_write-check-for-tpgt-first.patch
|
||||
Patch0003: 0003-idbm_rec_write-seperate-old-and-new-style-writes.patch
|
||||
Patch0004: 0004-idbw_rec_write-pick-tpgt-from-existing-record.patch
|
||||
Patch0005: 0005-update-initscripts-and-docs.patch
|
||||
Patch0006: 0006-use-var-for-config.patch
|
||||
Patch0007: 0007-use-red-hat-for-name.patch
|
||||
Patch0008: 0008-libiscsi.patch
|
||||
Patch0009: 0009-Add-macros-to-release-GIL-lock.patch
|
||||
Patch0010: 0010-libiscsi-introduce-sessions-API.patch
|
||||
Patch0011: 0011-libiscsi-fix-discovery-request-timeout-regression.patch
|
||||
Patch0012: 0012-libiscsi-format-security-build-errors.patch
|
||||
Patch0013: 0013-libiscsi-fix-build-to-use-libopeniscsiusr.patch
|
||||
Patch0014: 0014-libiscsi-fix-build-against-latest-upstream-again.patch
|
||||
Patch0015: 0015-remove-the-offload-boot-supported-ifdef.patch
|
||||
Patch0016: 0016-Revert-iscsiadm-return-error-when-login-fails.patch
|
||||
Patch0017: 0017-dont-install-scripts.patch
|
||||
Patch0018: 0018-use-var-lib-iscsi-in-libopeniscsiusr.patch
|
||||
Patch0019: 0019-Coverity-scan-fixes.patch
|
||||
Patch0020: 0020-fix-upstream-build-breakage-of-iscsiuio-LDFLAGS.patch
|
||||
Patch0021: 0021-use-Red-Hat-version-string-to-match-RPM-package-vers.patch
|
||||
Patch0022: 0022-iscsi_if.h-replace-zero-length-array-with-flexible-a.patch
|
||||
Patch0023: 0023-stop-using-Werror-for-now.patch
|
||||
Patch0024: 0024-iscsistart-fix-null-pointer-deref-before-exit.patch
|
||||
|
||||
BuildRequires: flex bison doxygen kmod-devel systemd-units
|
||||
BuildRequires: autoconf automake libtool libmount-devel openssl-devel
|
||||
BuildRequires: isns-utils-devel
|
||||
BuildRequires: systemd-devel
|
||||
# For dir ownership
|
||||
Requires: %{name}-iscsiuio >= %{version}-%{release}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
|
||||
# Old NetworkManager expects the dispatcher scripts in a different place
|
||||
Conflicts: NetworkManager < 1.20
|
||||
|
||||
%global _hardened_build 1
|
||||
%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$
|
||||
|
||||
|
@ -64,21 +70,21 @@ Protocol networks.
|
|||
# I don't think we're ready to expose these just yet
|
||||
# For now just add the needed library to the base package
|
||||
|
||||
#%package -n libopeniscsiusr
|
||||
#%%package -n libopeniscsiusr
|
||||
#Summary: library providing access to Open-iSCSI initiator functionality
|
||||
#Group: Development/Libraries
|
||||
#License: BSD
|
||||
|
||||
#%description -n libopeniscsiusr
|
||||
#%%description -n libopeniscsiusr
|
||||
#The libopeniscsiusr library provides a C API for access to the Open-iSCSI
|
||||
#initiator. It is used by the Open-iSCSI command line tools.
|
||||
|
||||
#%package -n libopeniscsiusr-devel
|
||||
#%%package -n libopeniscsiusr-devel
|
||||
#Summary: Development files for libopeniscsiusr
|
||||
#Group: Development/Libraries
|
||||
#Requires: libopeniscsiusr = %{version}-%{release}
|
||||
#Requires: libopeniscsiusr = %%{version}-%%{release}
|
||||
|
||||
#%description -n libopeniscsiusr-devel
|
||||
#%%description -n libopeniscsiusr-devel
|
||||
#The libopeniscsiusr-devel package contains libraries and header files for
|
||||
#developing applications that use libopeniscsiusr.
|
||||
|
||||
|
@ -106,20 +112,21 @@ developing applications that use %{name}.
|
|||
%{?python_provide:%python_provide python2-%{name}}
|
||||
Summary: Python %{python2_version} bindings to %{name}
|
||||
Group: Development/Libraries
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
|
||||
%description -n python2-%{name}
|
||||
The %{name}-python2 package contains Python %{python2_version} bindings to the
|
||||
libiscsi interface for interacting with %{name}
|
||||
%endif # with python2
|
||||
%endif
|
||||
# ended with python2
|
||||
|
||||
%package -n python3-%{name}
|
||||
%{?python_provide:%python_provide python3-%{name}}
|
||||
Summary: Python %{python3_version} bindings to %{name}
|
||||
Group: Development/Libraries
|
||||
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
|
||||
|
@ -142,11 +149,12 @@ autoreconf --install
|
|||
%{configure}
|
||||
cd ..
|
||||
|
||||
%{__make} OPTFLAGS="%{optflags} %{?__global_ldflags} -DUSE_KMOD -lkmod"
|
||||
%{__make} OPTFLAGS="%{optflags} %{?__global_ldflags}"
|
||||
pushd libiscsi
|
||||
%if %{with python2}
|
||||
%py2_build
|
||||
%endif # with python2
|
||||
%endif
|
||||
# ended with python2
|
||||
%py3_build
|
||||
touch -r libiscsi.doxy html/*
|
||||
popd
|
||||
|
@ -155,7 +163,7 @@ popd
|
|||
%install
|
||||
%{__make} DESTDIR=%{?buildroot} install_programs install_doc install_etc install_libopeniscsiusr
|
||||
# upstream makefile doesn't get everything the way we like it
|
||||
#rm $RPM_BUILD_ROOT%{_sbindir}/iscsi_discovery
|
||||
#rm $RPM_BUILD_ROOT%%{_sbindir}/iscsi_discovery
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_discovery.8
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_fw_login.8
|
||||
%{__install} -pm 755 usr/iscsistart $RPM_BUILD_ROOT%{_sbindir}
|
||||
|
@ -173,12 +181,14 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/iscsi_fw_login.8
|
|||
%{__install} -d $RPM_BUILD_ROOT%{_sharedstatedir}/iscsi/ifaces
|
||||
|
||||
# for %%ghost
|
||||
%{__install} -d $RPM_BUILD_ROOT/var/lock/iscsi
|
||||
touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
|
||||
%{__install} -d $RPM_BUILD_ROOT%{_rundir}/lock/iscsi
|
||||
touch $RPM_BUILD_ROOT%{_rundir}/lock/iscsi/lock
|
||||
|
||||
|
||||
%{__install} -d $RPM_BUILD_ROOT%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsi.service $RPM_BUILD_ROOT%{_unitdir}
|
||||
# %%{__install} -pm 644 etc/systemd/iscsi-init.service $RPM_BUILD_ROOT%%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsi-onboot.service $RPM_BUILD_ROOT%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsi-shutdown.service $RPM_BUILD_ROOT%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsid.service $RPM_BUILD_ROOT%{_unitdir}
|
||||
%{__install} -pm 644 etc/systemd/iscsid.socket $RPM_BUILD_ROOT%{_unitdir}
|
||||
|
@ -188,8 +198,8 @@ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
|
|||
%{__install} -d $RPM_BUILD_ROOT%{_libexecdir}
|
||||
%{__install} -pm 755 etc/systemd/iscsi-mark-root-nodes $RPM_BUILD_ROOT%{_libexecdir}
|
||||
|
||||
%{__install} -d $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
|
||||
%{__install} -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/dispatcher.d
|
||||
%{__install} -d $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d
|
||||
%{__install} -pm 755 %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/lib/NetworkManager/dispatcher.d
|
||||
|
||||
%{__install} -d $RPM_BUILD_ROOT%{_tmpfilesdir}
|
||||
%{__install} -pm 644 %{SOURCE5} $RPM_BUILD_ROOT%{_tmpfilesdir}/iscsi.conf
|
||||
|
@ -202,12 +212,14 @@ touch $RPM_BUILD_ROOT/var/lock/iscsi/lock
|
|||
|
||||
%if %{with python2}
|
||||
%{__install} -d $RPM_BUILD_ROOT%{python2_sitearch}
|
||||
%endif # with python2
|
||||
%endif
|
||||
# ended with python2
|
||||
%{__install} -d $RPM_BUILD_ROOT%{python3_sitearch}
|
||||
pushd libiscsi
|
||||
%if %{with python2}
|
||||
%py2_install
|
||||
%endif # with python2
|
||||
%endif
|
||||
# ended with python2
|
||||
%py3_install
|
||||
popd
|
||||
|
||||
|
@ -215,7 +227,7 @@ popd
|
|||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%systemd_post iscsi.service iscsi-shutdown.service iscsid.service iscsid.socket
|
||||
%systemd_post iscsi.service iscsi-onboot.service iscsi-shutdown.service iscsid.service iscsid.socket
|
||||
|
||||
if [ $1 -eq 1 ]; then
|
||||
if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ]; then
|
||||
|
@ -223,6 +235,7 @@ if [ $1 -eq 1 ]; then
|
|||
fi
|
||||
# enable socket activation and persistant session startup by default
|
||||
/bin/systemctl enable iscsi.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl enable iscsi-onboot.service >/dev/null 2>&1 || :
|
||||
/bin/systemctl enable iscsid.socket >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
|
@ -234,17 +247,17 @@ if [ $1 -eq 1 ]; then
|
|||
fi
|
||||
|
||||
%preun
|
||||
%systemd_preun iscsi.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
|
||||
%systemd_preun iscsi.service iscsi-onboot.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
|
||||
|
||||
%preun iscsiuio
|
||||
%systemd_preun iscsiuio.service iscsiuio.socket
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%systemd_postun
|
||||
%systemd_postun iscsi.service iscsi-onboot.service iscsi-shutdown.service iscsid.service iscsiuio.service iscsid.socket iscsiuio.socket
|
||||
|
||||
%postun iscsiuio
|
||||
%systemd_postun
|
||||
%systemd_postun iscsiuio.service iscsiuio.socket
|
||||
|
||||
%triggerun -- iscsi-initiator-utils < 6.2.0.873-25
|
||||
# prior to 6.2.0.873-24 iscsi.service was missing a Wants=remote-fs-pre.target
|
||||
|
@ -271,6 +284,11 @@ if [ $1 -gt 0 ]; then
|
|||
systemctl start iscsi-shutdown.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%triggerpostun -- iscsi-initiator-utils < 6.2.0.878-4
|
||||
# added in 6.2.0.878-0, needs to be enabled during an upgrade
|
||||
if [ $1 -gt 0 ]; then
|
||||
/bin/systemctl enable iscsi-onboot.service >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%files
|
||||
%doc README
|
||||
|
@ -281,14 +299,16 @@ fi
|
|||
%dir %{_sharedstatedir}/iscsi/slp
|
||||
%dir %{_sharedstatedir}/iscsi/ifaces
|
||||
%dir %{_sharedstatedir}/iscsi/send_targets
|
||||
%ghost %{_var}/lock/iscsi
|
||||
%ghost %{_var}/lock/iscsi/lock
|
||||
%ghost %attr(0700, -, -) %{_rundir}/lock/iscsi
|
||||
%ghost %attr(0600, -, -) %{_rundir}/lock/iscsi/lock
|
||||
%{_unitdir}/iscsi.service
|
||||
%{_unitdir}/iscsi-onboot.service
|
||||
# %%{_unitdir}/iscsi-init.service
|
||||
%{_unitdir}/iscsi-shutdown.service
|
||||
%{_unitdir}/iscsid.service
|
||||
%{_unitdir}/iscsid.socket
|
||||
%{_libexecdir}/iscsi-mark-root-nodes
|
||||
%{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi
|
||||
%{_prefix}/lib/NetworkManager
|
||||
%{_tmpfilesdir}/iscsi.conf
|
||||
%dir %{_sysconfdir}/iscsi
|
||||
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
|
||||
|
@ -307,19 +327,20 @@ fi
|
|||
%exclude %{_includedir}/libopeniscsiusr.h
|
||||
%exclude %{_includedir}/libopeniscsiusr_common.h
|
||||
%exclude %{_includedir}/libopeniscsiusr_iface.h
|
||||
%exclude %{_includedir}/libopeniscsiusr_node.h
|
||||
%exclude %{_includedir}/libopeniscsiusr_session.h
|
||||
%exclude %{_libdir}/pkgconfig/libopeniscsiusr.pc
|
||||
|
||||
# %files -n libopeniscsiusr
|
||||
# %{_libdir}/libopeniscsiusr.so.*
|
||||
# %%files -n libopeniscsiusr
|
||||
# %%{_libdir}/libopeniscsiusr.so.*
|
||||
#
|
||||
# %files -n libopeniscsiusr-devel
|
||||
# %{_libdir}/libopeniscsiusr.so
|
||||
# %{_includedir}/libopeniscsiusr.h
|
||||
# %{_includedir}/libopeniscsiusr_common.h
|
||||
# %{_includedir}/libopeniscsiusr_iface.h
|
||||
# %{_includedir}/libopeniscsiusr_session.h
|
||||
# %{_libdir}/pkgconfig/libopeniscsiusr.pc
|
||||
# %%files -n libopeniscsiusr-devel
|
||||
# %%{_libdir}/libopeniscsiusr.so
|
||||
# %%{_includedir}/libopeniscsiusr.h
|
||||
# %%{_includedir}/libopeniscsiusr_common.h
|
||||
# %%{_includedir}/libopeniscsiusr_iface.h
|
||||
# %%{_includedir}/libopeniscsiusr_session.h
|
||||
# %%{_libdir}/pkgconfig/libopeniscsiusr.pc
|
||||
|
||||
%files iscsiuio
|
||||
%{_sbindir}/iscsiuio
|
||||
|
@ -336,12 +357,59 @@ fi
|
|||
%if %{with python2}
|
||||
%files -n python2-%{name}
|
||||
%{python2_sitearch}/*
|
||||
%endif # with python2
|
||||
%endif
|
||||
# ended with python2
|
||||
|
||||
%files -n python3-%{name}
|
||||
%{python3_sitearch}/*
|
||||
|
||||
%changelog
|
||||
* Thu Jun 15 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-8.git095f59c
|
||||
- fix gating test
|
||||
|
||||
* Thu Jun 15 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-7.git095f59c
|
||||
- move tests to tmt framework
|
||||
|
||||
* Tue Jun 13 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-6.git095f59c
|
||||
- restore missing gating tests
|
||||
|
||||
* Wed Jun 07 2023 Chris Leech <cleech@redhat.com> - 6.2.1.4-5.git095f59c
|
||||
- 2131090 fix idbm patch to not overwrite upstream changes in file mode
|
||||
|
||||
* Mon Aug 09 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-4.git095f59c
|
||||
- 1755907 set proper attr in rpm db for lockfiles, fixes rpm verificiation warning
|
||||
|
||||
* Wed Jun 16 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-3.git095f59c
|
||||
- coverity found a use-after-free regression in iscsistart
|
||||
|
||||
* Mon Jun 14 2021 Chris Leech <cleech@redhat.com> - 6.2.1.4-2.git095f59c
|
||||
- 1924768 fix unit files for el8, not using iscsi-init
|
||||
|
||||
* Fri Mar 12 2021 Chris Leech <cleech@redhat.com> - 6.2.1.2-1.gita8fcb37
|
||||
- 1924768 iscsiadm -m sessions fails when racing against session login/logout
|
||||
|
||||
* Thu Aug 20 2020 Chris Leech - 6.2.0.878-5.gitd791ce0
|
||||
- 1849931, 1869438 go back to MD5 CHAP only by default
|
||||
new CHAP modes can cause issue with some targets,
|
||||
so SHA1/SHA256/SHA3-256 modes must be configured to enable now
|
||||
|
||||
* Tue Mar 24 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-3.gitd791ce0
|
||||
- 1801577 new service file not enabled on upgrade, spec change to use triggers for that
|
||||
|
||||
* Mon Feb 17 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-3.gitd791ce0
|
||||
- 1801577 missing spec file changes from 6.2.0.878-0 causing iSCSI boot regression
|
||||
|
||||
* Mon Jan 20 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-2.gitd791ce0
|
||||
- 1786015 fix IPv6 discovery regression in iscsiuio
|
||||
|
||||
* Wed Jan 08 2020 Chris Leech <cleech@redhat.com> - 6.2.0.878-1.gitd791ce0
|
||||
- 1788233 added node.session.auth.chap_algs configuration setting
|
||||
|
||||
* Thu Nov 07 2019 Chris Leech <cleech@redhat.com> - 6.2.0.878-0.gitd791ce0
|
||||
- 1761940 iSCSI CHAP authentication not function with FIPS enabled
|
||||
- Service file improvements forward ported from RHEL 7.8
|
||||
- various static analysis fixes from upstream
|
||||
|
||||
* Wed Jun 05 2019 Chris Leech <cleech@redhat.com> - 6.2.0.877-1.gitf71581b
|
||||
- fix Covscan reported issues from upstream patches
|
||||
|
||||
|
|
Loading…
Reference in New Issue