* [PATCH] Update old references to /usr/lib/iproute2
@ 2026-02-28 21:03 Yedaya Katsman
2026-03-02 16:18 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Yedaya Katsman @ 2026-02-28 21:03 UTC (permalink / raw)
To: Stephen Hemminger, David Ahern
Cc: Andrea Claudi, Luca Boccassi, netdev, Yedaya Katsman
In 962692356a1c ("Makefile: use /usr/share/iproute2 for config files")
The path was changed to /usr/share/, but a comment and a define were still
using the old path, Update them.
Signed-off-by: Yedaya Katsman <yedaya.ka@gmail.com>
---
include/utils.h | 2 +-
lib/rt_names.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/utils.h b/include/utils.h
index e0a9c780cb9eb16223905374916813d1b1e7711f..9d3e152775904a7de0cfb5833128590eb94e2f7c 100644
--- a/include/utils.h
+++ b/include/utils.h
@@ -40,7 +40,7 @@ extern int echo_request;
extern int use_iec;
#ifndef CONF_USR_DIR
-#define CONF_USR_DIR "/usr/lib/iproute2"
+#define CONF_USR_DIR "/usr/share/iproute2"
#endif
#ifndef CONF_ETC_DIR
#define CONF_ETC_DIR "/etc/iproute2"
diff --git a/lib/rt_names.c b/lib/rt_names.c
index 7dc194b1530cfdad3bc3b20c3b9e3bb0d4d09cb0..01ad87b41cb2a02b7bf7ec12c8c50fc38830ebfa 100644
--- a/lib/rt_names.c
+++ b/lib/rt_names.c
@@ -208,7 +208,7 @@ 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 /usr/share/iproute2/foo.d/X conf files, unless /etc/iproute2/foo.d/X exists */
rtnl_tabhash_readdir(dirpath_usr, dirpath_etc, tabhash, size);
/* load /etc/iproute2/foo.d/X conf files */
---
base-commit: 218757a8b8bb431b382d7a104edb6ed4336d3b43
change-id: 20260228-usr-lib-to-usr-share-c09a2ffd0f8a
Best regards,
--
Yedaya Katsman <yedaya.ka@gmail.com>
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Update old references to /usr/lib/iproute2
2026-02-28 21:03 [PATCH] Update old references to /usr/lib/iproute2 Yedaya Katsman
@ 2026-03-02 16:18 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2026-03-02 16:18 UTC (permalink / raw)
To: Yedaya Katsman; +Cc: David Ahern, Andrea Claudi, Luca Boccassi, netdev
On Sat, 28 Feb 2026 23:03:59 +0200
Yedaya Katsman <yedaya.ka@gmail.com> wrote:
> In 962692356a1c ("Makefile: use /usr/share/iproute2 for config files")
> The path was changed to /usr/share/, but a comment and a define were still
> using the old path, Update them.
>
> Signed-off-by: Yedaya Katsman <yedaya.ka@gmail.com>
I would rather remove the #define's in include/utils.h
The file is internal, and everywhere is using the values that
are in the Makefile.
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]
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-03-02 16:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-28 21:03 [PATCH] Update old references to /usr/lib/iproute2 Yedaya Katsman
2026-03-02 16:18 ` Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox