Commit 531b5134 authored by Adam Wujek's avatar Adam Wujek

arch-wrs: use /etc/ppsi.conf as default config file

On the switch, there is no need for the ppsi to use config file in
the /wr/etc/ppsi.conf.
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent b4294014
......@@ -183,8 +183,6 @@ int main(int argc, char **argv)
return -1;
/* If no item has been parsed, provide a default file or string */
if (ppg->cfg.cfg_items == 0)
pp_config_file(ppg, 0, "/wr/etc/ppsi.conf");
if (ppg->cfg.cfg_items == 0)
pp_config_file(ppg, 0, PP_DEFAULT_CONFIGFILE);
if (ppg->cfg.cfg_items == 0) {
......
......@@ -400,8 +400,7 @@ semicolon as a separator.
If no configuration file is specified, the program reads the default
one, which is architecture-specific (thus, the default configuration
file is processed after all the command line configuration items. The
default file name is @t{/etc/ppsi.conf}, but @t{arch-wrs} tries to
load @t{/wr/etc/ppsi.conf} first. The source tree of PPSi includes
default file name is @t{/etc/ppsi.conf}. The source tree of PPSi includes
two example configuration files in its own @t{etc/} subdirectory.
Configuration is made of of global options and port-specific options.
......@@ -1210,8 +1209,7 @@ a list of the other ones please see the help message.
Read configuration file. The program can read several
configuration files. If no @t{-f} is passed, it tries to
read a configuration file from the standard places:
@t{/wr/etc/ppsi.conf} if White Rabbit, and @t{/etc/ppsi.conf}.
read a configuration file from the standard place @t{/etc/ppsi.conf}.
@item -C <config-item>
......
# ppsi suggested configuration file the White Rabbit Switch
# The WRS looks for this in /wr/etc/ppsi.conf or /etc/ppsi.conf
# The WRS looks for this in /etc/ppsi.conf
# Global settings
clock-class 187
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment