multipathd: Read environment variables from systemd

[multipath-tools/.git] / multipathd / main.c

diff --git a/multipathd/main.c b/multipathd/main.c
index d8d1204..9b4e7c0 100644 (file)
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -1552,7 +1552,13 @@ set_oom_adj (void)
 #endif
        FILE *fp;
        struct stat st;
 #endif
        FILE *fp;
        struct stat st;

+       char *envp;

 
 

+       envp = getenv("OOMScoreAdjust");
+       if (envp) {
+               condlog(3, "Using systemd provided OOMScoreAdjust");
+               return;
+       }

        do {
                if (stat(file, &st) == 0){
                        fp = fopen(file, "w");
        do {
                if (stat(file, &st) == 0){
                        fp = fopen(file, "w");


@@ -1628,7 +1634,11 @@ child (void * param)
 
        setlogmask(LOG_UPTO(conf->verbosity + 3));
 
 
        setlogmask(LOG_UPTO(conf->verbosity + 3));
 

-       if (conf->max_fds) {
+       envp = getenv("LimitNOFILE");
+
+       if (envp) {
+               condlog(2,"Using systemd provided open fds limit of %s", envp);
+       } else if (conf->max_fds) {

                struct rlimit fd_limit;
 
                if (getrlimit(RLIMIT_NOFILE, &fd_limit) < 0) {
                struct rlimit fd_limit;
 
                if (getrlimit(RLIMIT_NOFILE, &fd_limit) < 0) {