From: Michael Tremer Date: Mon, 30 Jan 2023 18:47:30 +0000 (+0000) Subject: networkd: Install a dbus policy X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5fab986b9ac9a692b26e5f5d49a51dce85ccf59;p=network.git networkd: Install a dbus policy Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 5cfeefab..eeda5ba8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,7 +62,8 @@ INSTALL_EXEC_HOOKS = UNINSTALL_EXEC_HOOKS = noinst_DATA = sbin_PROGRAMS = -dist_dbussystembusdir_DATA = +dist_dbuspolicy_DATA = +dist_dbussystembus_DATA = AM_CPPFLAGS = \ $(OUR_CPPFLAGS) \ @@ -331,7 +332,10 @@ networkd_LDFLAGS = \ networkd_LDADD = \ $(SYSTEMD_LIBS) -dist_dbussystembusdir_DATA += \ +dist_dbuspolicy_DATA += \ + src/networkd/org.ipfire.network1.conf + +dist_dbussystembus_DATA += \ src/networkd/org.ipfire.network1.service # ------------------------------------------------------------------------------ diff --git a/configure.ac b/configure.ac index 8634a396..e612ff82 100644 --- a/configure.ac +++ b/configure.ac @@ -135,6 +135,18 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) # ------------------------------------------------------------------------------ +AC_ARG_WITH( + [dbuspolicydir], + AS_HELP_STRING( + [--with-dbuspolicydir=arg], + [directory for D-Bus policies (default: ${dbusdatadir|datarootdir}/dbus-1/system.d)] + ), + [dbuspolicydir="$withval"], + [PKG_CHECK_VAR([dbusdatadir], [dbus-1], [datadir],, [dbusdatadir="${datarootdir}"]) + dbuspolicydir="${dbusdatadir}/dbus-1/system.d"] +) +AC_SUBST(dbuspolicydir) + AC_ARG_WITH([dbussystembusdir], AS_HELP_STRING([--with-dbussystembusdir=DIR], [path to D-Bus system bus services directory]), [with_dbussystembusdir=${withval}]) if test -z "${with_dbussystembusdir}"; then diff --git a/src/networkd/org.ipfire.network1.conf b/src/networkd/org.ipfire.network1.conf new file mode 100644 index 00000000..96e8e15a --- /dev/null +++ b/src/networkd/org.ipfire.network1.conf @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + +