Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-18 09:10:38 +01:00
Code Releases Activity

build: Add systemd network link file to disable persistent naming

Browse Source
This commit is contained in:
Marcel Holtmann 2019-10-25 00:15:05 +02:00
parent d4d35c7872
commit cd0d57077e
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -148,6 +148,9 @@ systemd_unit_DATA =
dbus_busdir = @DBUS_BUSDIR@ dbus_busdir = @DBUS_BUSDIR@
dbus_bus_DATA = dbus_bus_DATA =
systemd_networkdir = @SYSTEMD_NETWORKDIR@
systemd_network_DATA =
systemd_modloaddir = @SYSTEMD_MODLOADDIR@ systemd_modloaddir = @SYSTEMD_MODLOADDIR@
systemd_modload_DATA = src/pkcs8.conf systemd_modload_DATA = src/pkcs8.conf
endif endif
@ -248,6 +251,8 @@ src_iwd_DEPENDENCIES += src/iwd.service
systemd_unit_DATA += src/iwd.service systemd_unit_DATA += src/iwd.service
dbus_bus_DATA += src/net.connman.iwd.service dbus_bus_DATA += src/net.connman.iwd.service
systemd_network_DATA += src/50-iwd.link
endif endif
if MANUAL_PAGES if MANUAL_PAGES
@ -507,7 +512,8 @@ TESTS = $(unit_tests)
EXTRA_DIST = src/genbuiltin src/iwd.service.in src/net.connman.iwd.service \ EXTRA_DIST = src/genbuiltin src/iwd.service.in src/net.connman.iwd.service \
wired/ead.service.in wired/net.connman.ead.service \ wired/ead.service.in wired/net.connman.ead.service \
src/pkcs8.conf doc/main.conf unit/gencerts.cnf \ src/50-iwd.link src/pkcs8.conf unit/gencerts.cnf \
doc/main.conf \
$(manual_pages) $(patsubst %.1,%.rst, \ $(manual_pages) $(patsubst %.1,%.rst, \
$(patsubst %.5,%.rst, \ $(patsubst %.5,%.rst, \
$(patsubst %.8,%.rst,$(manual_pages)))) $(patsubst %.8,%.rst,$(manual_pages))))

14
configure.ac
View File

@ -222,6 +222,20 @@ if (test "${enable_systemd_service}" != "no" && test -z "${path_systemd_unitdir}
fi fi
AC_SUBST(SYSTEMD_UNITDIR, [${path_systemd_unitdir}]) AC_SUBST(SYSTEMD_UNITDIR, [${path_systemd_unitdir}])
AC_ARG_WITH([systemd-networkdir], AC_HELP_STRING([--with-systemd-networkdir=DIR],
[path to systemd network directory]),
[path_systemd_networkdir=${withval}])
if (test "${enable_systemd_service}" != "no" && test -z "${path_systemd_networkdir}"); then
AC_MSG_CHECKING([systemd network directory])
path_systemd_networkdir="`$PKG_CONFIG --variable=systemdutildir systemd`"
if (test -z "${path_systemd_networkdir}"); then
AC_MSG_ERROR([systemd network directory is required])
fi
path_systemd_networkdir="${path_systemd_networkdir}/network"
AC_MSG_RESULT([${path_systemd_networkdir}])
fi
AC_SUBST(SYSTEMD_NETWORKDIR, [${path_systemd_networkdir}])
AC_ARG_WITH([systemd-modloaddir], AC_HELP_STRING([--with-systemd-modloaddir=DIR], AC_ARG_WITH([systemd-modloaddir], AC_HELP_STRING([--with-systemd-modloaddir=DIR],
[path to systemd modules load directory]), [path to systemd modules load directory]),
[path_systemd_modloaddir=${withval}]) [path_systemd_modloaddir=${withval}])

5
src/50-iwd.link Normal file
View File

@ -0,0 +1,5 @@
[Match]
Type=wlan
[Link]
NamePolicy=keep kernel