diff options
| -rw-r--r-- | Changelog | 42 | ||||
| -rw-r--r-- | libopeniscsiusr/version.h | 2 | ||||
| -rw-r--r-- | usr/idbm.c | 6 | ||||
| -rw-r--r-- | usr/version.h | 2 | ||||
| -rwxr-xr-x | utils/iscsi-gen-initiatorname | 51 |
5 files changed, 73 insertions, 30 deletions
@@ -1,3 +1,45 @@ +-> open-iscsi-2.1.5 - open-iscsi-2.1.6 + +Chris Leech (1): + libopeniscsiusr: extend sysfs ignore_error to include EINVAL + +Lee Duncan (15): + Fix compiler error introduced with recent IPv6 commit. + Remove dependences from iscsi-init.service + Use "sbindir" for path in systemd service files + Updated README a bit + Finish ability to have binary location configurable. + Fix iscsi-init so that it runs when root writable + remove redundant params in Makefile + Fixing last parts of sbindir configuration + Cosmetic cleanup on recent addition + Update the iscsi-gen-initiatorname script: harden and generalize + change iscsi-gen-initiatorname option -b => -p + Add man page for the iscsi-gen-initiatorname script. + Install new man page for iscsi-gen-initiatorname + Fix issues discovered by gcc12 + Fix more issues discovered by gcc12 + +Mike Christie (4): + iscsi sysfs: check state before onlining devs + iscsistart: fix login timeout handling + iscsid: use infinite timeout if passed in + iscsid: add error code for req timeouts + +Samy Mahmoudi (1): + Improve 'iscsid.conf' + +Wenchao Hao (8): + iscsiadm: Call log_init() first to fix a segmentation fault + iscsi_err: Add iscsid request timed out error messages + Fix wrong install_systemd destination path + actor: add name to struct actor and init it with function name + actor: print thread name in log + actor: enhanced: print error log when init a initilized thread + initiator_common: make set operational parameter log easy to read + iscsid: Check session id before start sync a thread + + open-iscsi-2.1.4 - open-iscsi-2.1.5 Chris Leech (1): diff --git a/libopeniscsiusr/version.h b/libopeniscsiusr/version.h index 8883573..5a7ec53 100644 --- a/libopeniscsiusr/version.h +++ b/libopeniscsiusr/version.h @@ -25,6 +25,6 @@ * 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.1.5" +#define ISCSI_VERSION_STR "2.1.6" #endif /* End of __ISCSI_OPEN_USR_VERSION_H__ */ @@ -1241,7 +1241,7 @@ void idbm_recinfo_config(recinfo_t *info, FILE *f) *(name+i) = *nl; i++; nl++; } if (!*nl) { - log_warning("config file line %d do not has value", + log_warning("Config file line %d does not have value", line_number); continue; } @@ -1249,7 +1249,7 @@ void idbm_recinfo_config(recinfo_t *info, FILE *f) /* skip after-name traling spaces */ while (*nl && isspace(c = *nl)) nl++; if (*nl && *nl != '=') { - log_warning("config file line %d has not '=' sepa", + log_warning("Config file line %d does not have '=' separator", line_number); continue; } @@ -1258,7 +1258,7 @@ void idbm_recinfo_config(recinfo_t *info, FILE *f) /* skip after-sepa traling spaces */ while (*nl && isspace(c = *nl)) nl++; if (!*nl) { - log_warning("config file line %d do not has value", + log_warning("Config file line %d does not have value", line_number); continue; } diff --git a/usr/version.h b/usr/version.h index 9af13aa..cc791cd 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.1.5" +#define ISCSI_VERSION_STR "2.1.6" #define ISCSI_VERSION_FILE "/sys/module/scsi_transport_iscsi/version" #endif diff --git a/utils/iscsi-gen-initiatorname b/utils/iscsi-gen-initiatorname index e182f8a..70ad8bf 100755 --- a/utils/iscsi-gen-initiatorname +++ b/utils/iscsi-gen-initiatorname @@ -4,7 +4,7 @@ # # Generate a default iSCSI Initiatorname for SUSE installations. # -# Copyright (c) 2021 Hannes Reinecke, SUSE Labs +# Copyright (c) 2022 Hannes Reinecke, SUSE Labs # This script is licensed under the GPL. # @@ -12,6 +12,29 @@ NAME="$0" INAME_FILE="/etc/iscsi/initiatorname.iscsi" IQN_PREFIX="iqn.1996-04.de.suse:01" +IBFT_COMMENTS="\ +## +## iSCSI Initiatorname taken from iBFT BIOS tables. +## +## DO NOT EDIT OR REMOVE THIS FILE! +## If you remove this file, the iSCSI daemon will not start. +## Any change here will not be reflected to the iBFT BIOS tables. +## If a different initiatorname is required please change the +## initiatorname in the BIOS setup and call +## @SBINDIR@/iscsi-gen-initiatorname -f +## to recreate an updated version of this file. +##" + +NORMAL_COMMENTS="\ +## +## Default iSCSI Initiatorname. +## +## DO NOT EDIT OR REMOVE THIS FILE! +## If you remove this file, the iSCSI daemon will not start. +## If you change the InitiatorName, existing access control lists +## may reject this initiator. The InitiatorName must be unique +## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames." + usage_and_exit() { xit_val=$1 @@ -62,19 +85,7 @@ fi if [ "$iSCSI_INITIATOR_NAME" ] ; then echo "##" > $INAME_FILE || exit 1 echo "## $INAME_FILE" >> $INAME_FILE - cat << EOF >> $INAME_FILE -## -## iSCSI Initiatorname taken from iBFT BIOS tables. -## -## DO NOT EDIT OR REMOVE THIS FILE! -## If you remove this file, the iSCSI daemon will not start. -## Any change here will not be reflected to the iBFT BIOS tables. -## If a different initiatorname is required please change the -## initiatorname in the BIOS setup and call -## @SBINDIR@/iscsi-gen-initiatorname -f -## to recreate an updated version of this file. -## -EOF + echo "$IBFT_COMMENTS" >> $INAME_FILE echo "InitiatorName=$iSCSI_INITIATOR_NAME" >> $INAME_FILE chmod 0600 $INAME_FILE fi @@ -83,19 +94,9 @@ fi if [ ! -f $INAME_FILE ] ; then echo "##" > $INAME_FILE || exit 1 echo "## $INAME_FILE" >> $INAME_FILE - cat << EOF >> $INAME_FILE -## -## Default iSCSI Initiatorname. -## -## DO NOT EDIT OR REMOVE THIS FILE! -## If you remove this file, the iSCSI daemon will not start. -## If you change the InitiatorName, existing access control lists -## may reject this initiator. The InitiatorName must be unique -## for each iSCSI initiator. Do NOT duplicate iSCSI InitiatorNames. -EOF + echo "$NORMAL_COMMENTS" >> $INAME_FILE # create a unique initiator name using iscsi-iname INAME=$(@SBINDIR@/iscsi-iname -p "$IQN_PREFIX") echo "InitiatorName=$INAME" >> $INAME_FILE chmod 0600 $INAME_FILE fi - |