From 27c3960daef657ee89f50a4a53c4f5f7f28700bd Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 3 Feb 2009 21:13:07 +0000
Subject: [PATCH] for pringing configuration value of "SLURM_CONF" or
"SLURMDBD_CONF" don't append (Path), making it more consistent with the other
values
---
src/api/config_info.c | 2 +-
src/sacctmgr/config_functions.c | 2 +-
src/slurmdbd/read_config.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/api/config_info.c b/src/api/config_info.c
index fd1ed0fe305..aee39de117f 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -330,7 +330,7 @@ void slurm_print_ctl_conf ( FILE* out,
slurm_ctl_conf_ptr->slurmd_spooldir);
fprintf(out, "SlurmdTimeout = %u sec\n",
slurm_ctl_conf_ptr->slurmd_timeout);
- fprintf(out, "SLURM_CONF (Path) = %s\n",
+ fprintf(out, "SLURM_CONF = %s\n",
slurm_ctl_conf_ptr->slurm_conf);
fprintf(out, "SLURM_VERSION = %s\n", SLURM_VERSION);
fprintf(out, "SrunEpilog = %s\n",
diff --git a/src/sacctmgr/config_functions.c b/src/sacctmgr/config_functions.c
index feb283f15a3..13be351ea75 100644
--- a/src/sacctmgr/config_functions.c
+++ b/src/sacctmgr/config_functions.c
@@ -136,7 +136,7 @@ static void _print_slurm_config(void)
user_name = uid_to_string(slurm_user_id);
printf("SlurmUserId = %s(%u)\n", user_name, slurm_user_id);
xfree(user_name);
- printf("SLURM_CONFIG_FILE = %s\n", default_slurm_config_file);
+ printf("SLURM_CONF = %s\n", default_slurm_config_file);
printf("SLURM_VERSION = %s\n", SLURM_VERSION);
printf("TrackWCKey = %u\n", track_wckey);
}
diff --git a/src/slurmdbd/read_config.c b/src/slurmdbd/read_config.c
index da7ada7e7bf..531a2655468 100644
--- a/src/slurmdbd/read_config.c
+++ b/src/slurmdbd/read_config.c
@@ -508,7 +508,7 @@ extern List dump_config(void)
list_append(my_list, key_pair);
key_pair = xmalloc(sizeof(config_key_pair_t));
- key_pair->name = xstrdup("SLURMDBD_CONF (path)");
+ key_pair->name = xstrdup("SLURMDBD_CONF");
key_pair->value = _get_conf_path();
list_append(my_list, key_pair);
--
GitLab