diff --git a/src/shared/meson.build b/src/shared/meson.build index 8cea90e9d6..3b53ce1a75 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -130,6 +130,8 @@ shared_sources = files(''' module-util.h mount-util.c mount-util.h + netif-naming-scheme.c + netif-naming-scheme.h nscd-flush.c nscd-flush.h nsflags.c diff --git a/src/udev/net/naming-scheme.c b/src/shared/netif-naming-scheme.c similarity index 98% rename from src/udev/net/naming-scheme.c rename to src/shared/netif-naming-scheme.c index 0d7f413e9e..ba8dd9228d 100644 --- a/src/udev/net/naming-scheme.c +++ b/src/shared/netif-naming-scheme.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ + #include "alloc-util.h" -#include "naming-scheme.h" +#include "netif-naming-scheme.h" #include "proc-cmdline.h" #include "string-util.h" diff --git a/src/udev/net/naming-scheme.h b/src/shared/netif-naming-scheme.h similarity index 100% rename from src/udev/net/naming-scheme.h rename to src/shared/netif-naming-scheme.h diff --git a/src/udev/meson.build b/src/udev/meson.build index 991d2eb24b..173b10be50 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -40,8 +40,6 @@ libudev_core_sources = ''' udev-builtin-usb_id.c net/link-config.c net/link-config.h - net/naming-scheme.c - net/naming-scheme.h '''.split() if conf.get('HAVE_KMOD') == 1 diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c index ad97a89447..d199d83411 100644 --- a/src/udev/net/link-config.c +++ b/src/udev/net/link-config.c @@ -16,7 +16,7 @@ #include "link-config.h" #include "log.h" #include "memory-util.h" -#include "naming-scheme.h" +#include "netif-naming-scheme.h" #include "netlink-util.h" #include "network-internal.h" #include "parse-util.h" diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c index da3fcc97e8..e94fff2520 100644 --- a/src/udev/udev-builtin-net_id.c +++ b/src/udev/udev-builtin-net_id.c @@ -27,7 +27,7 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "naming-scheme.h" +#include "netif-naming-scheme.h" #include "parse-util.h" #include "proc-cmdline.h" #include "stdio-util.h"