diff options
| author | Lee Duncan <lduncan@suse.com> | 2019-05-14 13:11:34 -0700 |
|---|---|---|
| committer | Lee Duncan <lduncan@suse.com> | 2019-05-14 13:11:34 -0700 |
| commit | f66608aa9ce989c91f744bb2f3f34d2e01aedc87 (patch) | |
| tree | 30d171913c2b4ce082d5f9a833b14768930c081a | |
| parent | 0cf0a05ae0ff67d9b68a69b68df89f42258c3c53 (diff) | |
| download | open-iscsi-f66608aa9ce989c91f744bb2f3f34d2e01aedc87.tar.gz | |
Make iscsid systemd usage optional
You can compile without system now by using something
like:
make OPTFLAGS="-DNO_SYSTEMD ..." NO_SYSTEMD=1
This will skip systemd code for iscsid and iscsiuio.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | usr/Makefile | 2 | ||||
| -rw-r--r-- | usr/iscsid.c | 6 |
3 files changed, 13 insertions, 0 deletions
@@ -40,6 +40,11 @@ ifneq (,$(CFLAGS)) export CFLAGS endif +# export systemd disablement if set +ifneq ($(NO_SYSTEMD),) +export NO_SYSTEMD +endif + # Random comments: # using '$(MAKE)' instead of just 'make' allows make to run in parallel # over multiple makefile. diff --git a/usr/Makefile b/usr/Makefile index f1c35aa..0203127 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -41,7 +41,9 @@ CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \ CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod) ISCSI_LIB = -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr LDFLAGS += $(shell $(PKG_CONFIG) --libs libkmod) +ifeq ($(NO_SYSTEMD),) LDFLAGS += $(shell $(PKG_CONFIG) --libs libsystemd) +endif PROGRAMS = iscsid iscsiadm iscsistart # libc compat files diff --git a/usr/iscsid.c b/usr/iscsid.c index 0c98440..37c13b3 100644 --- a/usr/iscsid.c +++ b/usr/iscsid.c @@ -34,7 +34,9 @@ #include <sys/wait.h> #include <sys/types.h> #include <sys/stat.h> +#ifndef NO_SYSTEMD #include <systemd/sd-daemon.h> +#endif #include "iscsid.h" #include "mgmt_ipc.h" @@ -339,6 +341,7 @@ static void missing_iname_warn(char *initiatorname_file) /* called right before we enter the event loop */ static void set_state_to_ready(void) { +#ifndef NO_SYSTEMD if (sessions_to_recover) sd_notify(0, "READY=1\n" "RELOADING=1\n" @@ -346,14 +349,17 @@ static void set_state_to_ready(void) else sd_notify(0, "READY=1\n" "STATUS=Ready to process requests\n"); +#endif } /* called when recovery process has been reaped */ static void set_state_done_reloading(void) { +#ifndef NO_SYSTEMD sessions_to_recover = 0; sd_notifyf(0, "READY=1\n" "STATUS=Ready to process requests\n"); +#endif } int main(int argc, char *argv[]) |