From 9fe973004d8dbffc07bbecbdbb6c828bfb832137 Mon Sep 17 00:00:00 2001 From: David Teigland Date: May 12 2017 16:35:52 +0000 Subject: dlm_controld: ignore daemon_debug in dlm.conf This option doesn't make sense to use from dlm.conf, only from the command line. --- diff --git a/dlm_controld/config.c b/dlm_controld/config.c index cfceb3e..3ba8a53 100644 --- a/dlm_controld/config.c +++ b/dlm_controld/config.c @@ -210,6 +210,10 @@ void set_opt_file(int update) if (!o) continue; + /* Doesn't make sense to set this in conf file. */ + if (!strcmp(str, "daemon_debug")) + continue; + o->file_set++; if (!o->req_arg) { diff --git a/dlm_controld/dlm.conf.5 b/dlm_controld/dlm.conf.5 index ca4209a..061c713 100644 --- a/dlm_controld/dlm.conf.5 +++ b/dlm_controld/dlm.conf.5 @@ -34,8 +34,6 @@ protocol=tcp Options: -daemon_debug -.br log_debug .br protocol