[PATCH iproute2] remove leftover references to /usr/lib/route2

[PATCH iproute2] remove leftover references to /usr/lib/route2

[Stephen Hemminger]

Since commit 962692356a1c ("Makefile: use /usr/share/iproute2 for config
files") the path was moved to /usr/share in Makefile; but there
were leftover references.

Reported-by: Yedaya Katsman <yedaya.ka@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 include/utils.h | 7 -------
 lib/rt_names.c  | 5 ++++-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/include/utils.h b/include/utils.h
index e0a9c780..adf6a581 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -39,13 +39,6 @@ extern bool do_all;
 extern int echo_request;
 extern int use_iec;
 
-#ifndef CONF_USR_DIR
-#define CONF_USR_DIR "/usr/lib/iproute2"
-#endif
-#ifndef CONF_ETC_DIR
-#define CONF_ETC_DIR "/etc/iproute2"
-#endif
-
 #define SPRINT_BSIZE 64
 #define SPRINT_BUF(x)	char x[SPRINT_BSIZE]
 
diff --git a/lib/rt_names.c b/lib/rt_names.c
index 7dc194b1..3dba9642 100644
--- a/lib/rt_names.c
+++ b/lib/rt_names.c
@@ -208,7 +208,10 @@ rtnl_tabhash_initialize_dir(const char *ddir, const struct tabhash tabhash, cons
 	snprintf(dirpath_usr, sizeof(dirpath_usr), "%s/%s", CONF_USR_DIR, ddir);
 	snprintf(dirpath_etc, sizeof(dirpath_etc), "%s/%s", CONF_ETC_DIR, ddir);
 
-	/* load /usr/lib/iproute2/foo.d/X conf files, unless /etc/iproute2/foo.d/X exists */
+	/*
+	 * load CONF_USR_DIR/iproute2/foo.d/X conf files
+	 * unless CONF_ETC_DIR/iproute2/foo.d/X exists
+	 */
 	rtnl_tabhash_readdir(dirpath_usr, dirpath_etc, tabhash, size);
 
 	/* load /etc/iproute2/foo.d/X conf files */
-- 
2.51.0

Re: [PATCH iproute2] remove leftover references to /usr/lib/route2

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to iproute2/iproute2.git (main)
by Stephen Hemminger <stephen@networkplumber.org>:

On Mon,  2 Mar 2026 08:40:07 -0800 you wrote:
> Since commit 962692356a1c ("Makefile: use /usr/share/iproute2 for config
> files") the path was moved to /usr/share in Makefile; but there
> were leftover references.
> 
> Reported-by: Yedaya Katsman <yedaya.ka@gmail.com>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> 
> [...]

Here is the summary with links:
  - [iproute2] remove leftover references to /usr/lib/route2
    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=bf0f8e79cd13

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html