summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update README's error handler/timeout sectiondoc-timersMike Christie2022-06-141-48/+166
| | | | | The README's error handling and timeout section is out dated or not correct. This patch updates it.
* Merge pull request #342 from wenchao-hao/iface_paramLee Duncan2022-05-201-0/+1
|\ | | | | Add ability to specify name-value parameters when creating a new iface
| * iscsiadm: enable specify iface name-value parameters when creating ifaceWenchao Hao2022-04-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to specify name-value parameters when creating a new iface like following: root# iscsiadm -m iface -I test -o new -n iface.initiatorname -v iqn.2016-04.com.open-iscsi:17a3c9bc2d test updated. New interface test added root# iscsiadm -m iface -I test | grep initiatorname iface.initiatorname = iqn.2016-04.com.open-iscsi:17a3c9bc2d Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
* | Merge pull request #351 from ericwmackay/boot_context_configLee Duncan2022-05-195-31/+75
|\ \ | | | | | | Use config for iscsistart and iscsiadm fw login
| * | Use config for iscsistart and iscsiadm fw loginEric Mackay2022-05-185-31/+75
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifying name-value pairs as arguments to iscsistart or iscsiadm can become unwieldy very quickly, and is less flexible than using a config file. If a user desires to update settings, modifying a config file and rebuilding initramfs can be simpler than modifying arguments directly in initramfs code or scripts. Node records created from boot context are populated with defaults, then any settings specified in a config file are applied (if config is present). FW and user-specified params are still applicable. User-specified name-value arguments are applied after config settings, so they can serve as a safeguard against config file changes if desired. Added -c|--config options for iscsistart to specify the config Updated iscsistart man page Signed-off-by: Eric Mackay <eric.mackay@oracle.com> Reviewed-by: Mike Christie <michael.christie@oracle.com>
* | Merge pull request #350 from ericwmackay/ipc_auth_uidLee Duncan2022-05-169-26/+89
|\ \ | | | | | | Add ability for MGMT IPC to check UID only
| * | Add ability for MGMT IPC to check UID onlyEric Mackay2022-05-169-26/+89
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default behavior in iscsid, which is to check mgmt IPCs for UID==0 and user explicitly named "root", is unchanged. This option to perform only the UID check for management IPCs can be enabled in iscsid.conf. This can be useful for running iscsid in a constrained environment, e.g., initramfs. For instance, klibc initramfs in Ubuntu and Debian does not include a user DB. Attempting to run iscsid and iscsiadm in klibc initramfs would result in ISCSI_ERR_ACCESS for all MGMT IPCs. Specifying just the UID check allows iscsid and iscsiadm to run in klibc initramfs without a user DB. systemd can still start an iscsid process later in boot with the default full MGMT IPC auth checks, leaving the steady-state behavior of iscsid the same as before. The following setting in iscsid.conf enables this behavior: iscsid.ipc_auth_uid = Yes iscsistart now uses this mechanism to only perform the UID check, rather than statically linking against an alternate implementation of getpwuid(). This is effectively the same behavior as before. Signed-off-by: Eric Mackay <eric.mackay@oracle.com> Reviewed-by: Mike Christie <michael.christie@oracle.com>
* | Merge pull request #348 from gonzoleeman/add-distclean-make-targetLee Duncan2022-05-097-13/+40
|\ \ | | | | | | Add a 'distclean' Makefile top-level target
| * | Add a 'distclean' Makefile top-level targetLee Duncan2022-05-097-13/+40
|/ / | | | | | | | | | | | | | | | | | | This cleans up a little more than "make clean", in particular removing files generated from templates, and automake-generated files in iscsiuio. Also, a ".PHONY:" target was added where needed so that each Makefile has a complete list of phony targets.
* | Merge pull request #343 from mikechristie/fix-logoutLee Duncan2022-05-071-7/+8
|\ \ | | | | | | iscsid: fix logout pdu send failure detection handling
| * | iscsid: fix logout pdu send failure handlingfix-logoutMike Christie2022-04-201-7/+8
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where when we send logout pdu we are incorrectly handling it as an error. This was added in https://github.com/open-iscsi/open-iscsi/pull/317 I think there might have been a mistake for which version of that patch got merged because there are some unhandled review comments in the merged code. The patch also fixes some review comments that were given in that review but were not handled when it was merged: 1. No space before "Dropping session" 2. Don't split error messages.
* | Merge pull request #341 from thesamesam/masterLee Duncan2022-05-071-10/+7
|\ \ | | | | | | iscsiuio: fix LDADD
| * | iscsiuio: fix LDADDSam James2022-04-151-10/+7
| |/ | | | | | | | | | | | | | | | | | | - We don't want to use _LIBS here, we're building a library, not an executable. - We want LDADD for the whole lot (not a mix of LDFLAGS/LIBS/LDADD), but put the objects/libraries (.a files) first so that -l* works correctly. Closes: https://github.com/open-iscsi/open-iscsi/issues/337 Fixes: 9fbd6009cd917f1152a367fa7e5ae3993133c1e4 Signed-off-by: Sam James <sam@gentoo.org>
* | Merge pull request #345 from gonzoleeman/new-versionLee Duncan2022-05-063-2/+75
|\ \ | | | | | | Preparing for version 2.1.7.
| * | Preparing for version 2.1.7.Lee Duncan2022-05-063-2/+75
|/ /
* | Merge pull request #344 from gonzoleeman/fix-ibft-rule-genLee Duncan2022-05-061-1/+1
|\ \ | |/ |/| Fix ibft-rule-generator shell error
| * Fix ibft-rule-generator shell errorLee Duncan2022-05-061-1/+1
|/ | | | | | | | | | Commit fe2c59e06a42 ("Create an systemd iBFT rule generator") created ibft-rule-generator, but it contains a syntax error, causing this error message when its run: > /usr/lib/systemd/system-generators/ibft-rule-generator: line 21: IBFT_RULE_DIR: command not found This fixes that error.
* Merge pull request #340 from gonzoleeman/make-ibft-build-more-stableLee Duncan2022-04-132-1/+23
|\ | | | | Make fwparam_ibft build more reliable.
| * Make fwparam_ibft build more reliable.Lee Duncan2022-04-132-1/+23
|/ | | | | | | | | | | | | | | | This build has lex and bison source files, but they are not normally used to regenerate C files, since that has been done ahead of time, statically, to handle the case when users building the software may not have these tools. But some build systems think the generated C files need to be regenerated because the timestamp on the source and generated files is so close, just because of the order the files were populated in this directory. So we tell the Makefile to only generate C files if those files are missing. This should have no effect, since these files should never need to be regenerated unless we change lex or bison logic.
* Merge pull request #333 from thesamesam/masterLee Duncan2022-04-107-14/+15
|\ | | | | Build system tweaks from downstream
| * libopeniscsiusr: fix version in installed pkgconfig (.pc) fileSam James2022-04-061-1/+1
| | | | | | | | | | | | | | Looks like a typo from libnvme. Previously, the installed .pc file had a blank Version field. Signed-off-by: Sam James <sam@gentoo.org>
| * Makefiles: don't hardcode sed, pkg-configSam James2022-04-062-3/+3
| | | | | | | | | | | | | | | | | | - On my system, sed appears to be at /bin/sed. So, let's allow overriding the location. - Allow different pkg-config paths too (useful for cross). Signed-off-by: Sam James <sam@gentoo.org>
| * Makefiles: respect $(CC) fully (don't hardcode GCC); use $(RM)Sam James2022-04-065-7/+7
| | | | | | | | | | | | | | - Don't hardcode GCC, instead respect the detected CC (or from the environment) - Use $(RM) as the location may vary and we've already done the work to detect it Signed-off-by: Sam James <sam@gentoo.org>
| * iscsiuio: respect LDFLAGS fullySam James2022-04-031-2/+3
| | | | | | | | | | | | | | | | | | | | | | Use LIBS rather than LDFLAGS which ensures automake gets the ordering right (some LDFLAGS values won't work correctly if not placed exactly before libraries). This should functionally work the same as before, just improve compatibility with bits like -Wl,--as-needed. Signed-off-by: Sam James <sam@gentoo.org>
| * iscsiuio: don't clobber LDFLAGS in configure.acSam James2022-04-031-1/+1
| | | | | | | | | | | | | | | | | | The systemd check currently clobbers LDFLAGS from the environment rather than appending to it. But we actually want LIBS here anyway, rather than LDFLAGS. Signed-off-by: Sam James <sam@gentoo.org>
* | Merge pull request #336 from gonzoleeman/use-kernel-initiatorname-if-presentLee Duncan2022-04-102-45/+146
|\ \ | | | | | | Use kernel initiatorname if present
| * | Check for root in iscsi-gen-initiatornameLee Duncan2022-04-082-6/+16
| | | | | | | | | | | | The man page is also updated
| * | utils: remove errant spaces in scriptLee Duncan2022-04-071-5/+5
| | | | | | | | | | | | | | | There were a few spaces accidentally left at the ends of a few lines in iscsi-gen-initiatorname, so remove them.
| * | Use kernel initiatorname when setting local inameLee Duncan2022-04-072-41/+132
|/ / | | | | | | | | | | | | | | | | | | | | Update the iscsi-gen-initatorname script to take its initiator name from the kernel command line, if present. Also, beef up and simplify the error checking. Error messages will now go to stderr, and it is now an error to overwrite the initiatorname file unless the "force" option is set. The man page was updated, as well.
* | Merge pull request #335 from gonzoleeman/latest-build-cleanups-v2Lee Duncan2022-04-056-25/+78
|\ \ | | | | | | Latest build cleanups and bug fixes
| * | Build: install systemd generator file with svc filesLee Duncan2022-04-041-4/+14
| | | | | | | | | | | | | | | | | | | | | Installation of the systemd generator file ibft-rule-generator is added in etc/Makefile to the "install" target, and that target is broken into "install_systemd_service_files", and "install_systemd_generator_files", for caller convenience.
| * | Create an systemd iBFT rule generatorLee Duncan2022-04-041-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | When dracut is booted with 'ip=ibft' it will rename the interfaces to "ibft*". This will cause error messages during booting, as later on systemd is trying to rename the ianterfaces again, which doesn't work as the interface is busy. So create a systemd generator for creating a dynamic udev rule to stop udev from renaming that interface.
| * | Build: add RULESDIR to top-level MakefileLee Duncan2022-04-041-1/+2
| | | | | | | | | | | | | | | | | | | | | Commit 9a2d2f2cf391 ("Make DB and ISCSIHOME directories configurable.") added use of RULESDIR in utils/Makefile, but it needs to be passed down from the top-level Makefile, as well, for it to be configurable at build time.
| * | Build: remove redundant definition in utils MakefileLee Duncan2022-04-041-2/+1
| | | | | | | | | | | | We do not need two definitions for "/etc" in utils/Makefile.
| * | Build: add libsystemd CFLAGS for building objectsLee Duncan2022-04-041-0/+1
| | | | | | | | | | | | | | | | | | This is already done for libkod in usr/Makefile, so do the same for libsystemd, even though most times these flags will be empty, that is not always the case.
| * | Build: cleanup libopeniscsiusr/MakefileLee Duncan2022-04-041-6/+6
| | | | | | | | | | | | | | | Do not need redundant slashes in pathnames. Also, install header files with the proper mode.
| * | Remove debug messages from libopeniscsiusr/MakefileLee Duncan2022-04-041-1/+0
| | | | | | | | | | | | | | | Commit 623a81123c494 ("Use pkg-config in Makefiles for newer libraries.") added a debugging echo statement. Remove it.
| * | Build: libopeniscsiusr install should install docsLee Duncan2022-04-041-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | We go to all the trouble to generate man pages for all the libopeniscsiusr routines, but we do not install them, so add installing them as part of the "install" target, ut break up that target into 3 sub-targets (install_libs, install_docs, and install_pkg_config) so that callers can choose subsets if they wish.
| * | Build: use upper- vs lower-case variable names correctlyLee Duncan2022-04-041-11/+12
| | | | | | | | | | | | | | | For the files we insall from etc/Makefile, this avoids prepending with DESTDIR twice.
| * | Build: remove unused Makefile HOMEDIR creationLee Duncan2022-04-041-3/+0
|/ / | | | | | | | | The "HOMEDIR" (/etc/iscsi by default) is no referenced in the top-level Makefile, so no need to create it here.
* | Merge pull request #330 from ryancaicse/masterLee Duncan2022-04-031-1/+1
|\ \ | | | | | | Fix a missing-unlocking bug
| * | Fix a missing-unlocking bugryancaicse2022-04-021-1/+1
| | | | | | | | | Fix a missing-unlocking bug in nic_utils.c
* | | Merge pull request #334 from gonzoleeman/fix-destdir-install-for-inameLee Duncan2022-04-033-9/+9
|\ \ \ | |_|/ |/| | Fix destdir install for iname
| * | Be smarter about creating iscsiuio.8 man pageLee Duncan2022-04-032-8/+8
| | | | | | | | | | | | | | | | | | | | | On install we created both usr/share/man/man8/iscsiuio.8 and usr/share/man/man8/iscsiuio.8.gz, since we installed from both iscsiuio/Makefile as well as from doc/Makefile, so get rid of the doc/Makefile version and just insall the gz from iscsiuio.
| * | Use DESTDIR correctly for HOMEDIR and DBROOTLee Duncan2022-04-031-1/+1
|/ / | | | | | | | | | | The top-level Makefile was adding in DESTDIR to HOMEDIR and DBROOT before passing them down to etc, where DESTDIR was being added again.
* | Merge pull request #332 from gonzoleeman/fix-gcc-issue-in-fwparamLee Duncan2022-04-022-7/+18
|\ \ | |/ |/| Fix gcc issues with unused params in fwparam
| * Fix gcc issues with unused params in fwparamLee Duncan2022-04-022-7/+18
|/ | | | | | Moving these files, as done recently, means they now can be compiled with different (more strict) options, so mark unused params as such.
* Merge pull request #328 from gonzoleeman/more-makefile-cleanupLee Duncan2022-04-0119-671/+62
|\ | | | | More makefile cleanup
| * Build: upate "depend" target to include sysdepsLee Duncan2022-03-311-1/+1
| |
| * Remove unused fwparam_ibft.[ch] files in fwparam_ibft.Lee Duncan2022-03-313-654/+5
| | | | | | | | These files are apparently unused, so remove them.