Commit fb72129b authored by Christoph J. Thompson's avatar Christoph J. Thompson Committed by Stephen Hemminger

iproute2 - Don't hardcode the path to config files

Allows using an alternate path for config files.
Signed-off-by: default avatarChristoph J. Thompson <cjsthompson@gmail.com>
parent bd886ebb
...@@ -23,6 +23,10 @@ ...@@ -23,6 +23,10 @@
#include "rt_names.h" #include "rt_names.h"
#ifndef CONFDIR
#define CONFDIR "/etc/iproute2"
#endif
struct rtnl_hash_entry { struct rtnl_hash_entry {
struct rtnl_hash_entry *next; struct rtnl_hash_entry *next;
char * name; char * name;
...@@ -129,7 +133,7 @@ static int rtnl_rtprot_init; ...@@ -129,7 +133,7 @@ static int rtnl_rtprot_init;
static void rtnl_rtprot_initialize(void) static void rtnl_rtprot_initialize(void)
{ {
rtnl_rtprot_init = 1; rtnl_rtprot_init = 1;
rtnl_tab_initialize("/etc/iproute2/rt_protos", rtnl_tab_initialize(CONFDIR "/rt_protos",
rtnl_rtprot_tab, 256); rtnl_rtprot_tab, 256);
} }
...@@ -196,7 +200,7 @@ static void rtnl_rtscope_initialize(void) ...@@ -196,7 +200,7 @@ static void rtnl_rtscope_initialize(void)
rtnl_rtscope_tab[254] = "host"; rtnl_rtscope_tab[254] = "host";
rtnl_rtscope_tab[253] = "link"; rtnl_rtscope_tab[253] = "link";
rtnl_rtscope_tab[200] = "site"; rtnl_rtscope_tab[200] = "site";
rtnl_tab_initialize("/etc/iproute2/rt_scopes", rtnl_tab_initialize(CONFDIR "/rt_scopes",
rtnl_rtscope_tab, 256); rtnl_rtscope_tab, 256);
} }
...@@ -259,7 +263,7 @@ static int rtnl_rtrealm_init; ...@@ -259,7 +263,7 @@ static int rtnl_rtrealm_init;
static void rtnl_rtrealm_initialize(void) static void rtnl_rtrealm_initialize(void)
{ {
rtnl_rtrealm_init = 1; rtnl_rtrealm_init = 1;
rtnl_tab_initialize("/etc/iproute2/rt_realms", rtnl_tab_initialize(CONFDIR "/rt_realms",
rtnl_rtrealm_tab, 256); rtnl_rtrealm_tab, 256);
} }
...@@ -328,7 +332,7 @@ static int rtnl_rttable_init; ...@@ -328,7 +332,7 @@ static int rtnl_rttable_init;
static void rtnl_rttable_initialize(void) static void rtnl_rttable_initialize(void)
{ {
rtnl_rttable_init = 1; rtnl_rttable_init = 1;
rtnl_hash_initialize("/etc/iproute2/rt_tables", rtnl_hash_initialize(CONFDIR "/rt_tables",
rtnl_rttable_hash, 256); rtnl_rttable_hash, 256);
} }
...@@ -396,7 +400,7 @@ static int rtnl_rtdsfield_init; ...@@ -396,7 +400,7 @@ static int rtnl_rtdsfield_init;
static void rtnl_rtdsfield_initialize(void) static void rtnl_rtdsfield_initialize(void)
{ {
rtnl_rtdsfield_init = 1; rtnl_rtdsfield_init = 1;
rtnl_tab_initialize("/etc/iproute2/rt_dsfield", rtnl_tab_initialize(CONFDIR "/rt_dsfield",
rtnl_rtdsfield_tab, 256); rtnl_rtdsfield_tab, 256);
} }
......
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