diff options
author | Lee Duncan <lduncan@suse.com> | 2022-03-25 07:54:18 -0700 |
---|---|---|
committer | Lee Duncan <lduncan@suse.com> | 2022-03-25 07:54:18 -0700 |
commit | 9a2d2f2cf391c707a98204d488c3cb3e58cdab00 (patch) | |
tree | b96c83ff4479e16f9032dcabf4435270f2ca6a9d /include | |
parent | 89df67cd154d43c9b8361880fbd0d94175ff65a1 (diff) | |
download | open-iscsi-9a2d2f2cf391c707a98204d488c3cb3e58cdab00.tar.gz |
Make DB and ISCSIHOME directories configurable.
This commit adds two new top-level build options: one
for the "home" directory for open-iscsi called "HOMEDIR",
and one for the "database" directory, called "DBROOT". One can
now override the defaults of "/etc/iscsi" for either or
both of these directories on the make command line.
The README and man pages are updated with details about
these new options.
Some Makefile cleanup/repair was done as well. Installation
of the initiatorname.iscsi file, was moved out of the top-level
Makefile into the etc subdirectory, and installation of man
ages moved from the top-level Makefile to the doc subdirectory.
Also, this fixes some issues from commit fd14dd8316b1 ("Clean
p Makefile build system."), which incorrectly changed the DESTDIR
ariable in the Makefiles. This current commit also fixes the
top-level variable names for moving DBROOT and HOMEDIR.
Diffstat (limited to 'include')
-rw-r--r-- | include/iscsi_net_util.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/iscsi_net_util.h b/include/iscsi_net_util.h index 16d48e3..a69af9d 100644 --- a/include/iscsi_net_util.h +++ b/include/iscsi_net_util.h @@ -2,7 +2,12 @@ #define __ISCSI_NET_UTIL_h__ #define ISCSI_HWADDRESS_BUF_SIZE 18 -#define ISCSIUIO_PATH "/sbin/iscsiuio" + +#ifndef SBINDIR +#define SBINDIR "/sbin" +#endif + +#define ISCSIUIO_PATH SBINDIR"/iscsiuio" extern int net_get_transport_name_from_netdev(char *netdev, char *transport); extern int net_get_netdev_from_hwaddress(char *hwaddress, char *netdev); |