|
 |
0acdca4 |
From 6e13ba9b4367fb7867f8a61930bd80b34970aa34 Mon Sep 17 00:00:00 2001
|
|
|
0acdca4 |
From: Lubomir Rintel <lkundrak@v3.sk>
|
|
|
0acdca4 |
Date: Thu, 22 Aug 2019 16:28:51 +0200
|
|
|
0acdca4 |
Subject: [PATCH] Move the NetworkManager dispatcher script out of /etc
|
|
|
0acdca4 |
|
|
|
0acdca4 |
It's not user configuration and shouldn't ever have been there. Except for that
|
|
|
0acdca4 |
it used to be the only location NetworkManager looked into. With NetworkManager
|
|
|
0acdca4 |
1.20 that is no longer the case and the dispatcher scripts can be moved to
|
|
|
0acdca4 |
/usr/lib.
|
|
|
0acdca4 |
|
|
|
0acdca4 |
Users of older NetworkManager versions can still override this on the
|
|
|
0acdca4 |
./configure command line.
|
|
|
0acdca4 |
---
|
|
|
0acdca4 |
README | 2 +-
|
|
|
0acdca4 |
configure | 10 +++++-----
|
|
|
0acdca4 |
configure.ac | 8 ++++----
|
|
|
0acdca4 |
3 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
0acdca4 |
|
|
|
0acdca4 |
diff --git a/README b/README
|
|
|
0acdca4 |
index 1ddc3f4..7093268 100644
|
|
|
0acdca4 |
--- a/README
|
|
|
0acdca4 |
+++ b/README
|
|
|
0acdca4 |
@@ -74,7 +74,7 @@ the secure version, but this was fixed in 0.6.
|
|
|
0acdca4 |
|
|
|
0acdca4 |
* unix - NetworkManager
|
|
|
0acdca4 |
|
|
|
0acdca4 |
-In /etc/NetworkManager/dispatcher.d a script sends DHCP changes to
|
|
|
0acdca4 |
+In /usr/lib/NetworkManager/dispatcher.d a script sends DHCP changes to
|
|
|
0acdca4 |
the daemon. The script is a networkmanager dhcp hook script and uses
|
|
|
0acdca4 |
dnssec-trigger-control to talk to the daemon. The script uses nmcli
|
|
|
0acdca4 |
to find the DNS info.
|
|
|
0acdca4 |
diff --git a/configure b/configure
|
|
|
0acdca4 |
index 16d86fc..1efddd3 100755
|
|
|
0acdca4 |
--- a/configure
|
|
|
0acdca4 |
+++ b/configure
|
|
|
0acdca4 |
@@ -1364,8 +1364,8 @@ Optional Packages:
|
|
|
0acdca4 |
'windows' or 'none'
|
|
|
0acdca4 |
--with-networkmanager-dispatch
|
|
|
0acdca4 |
Set the networkmanager dhcp dispatcher dir, default
|
|
|
0acdca4 |
- tests prefix/etc/NetworkManager/dispatcher.d and
|
|
|
0acdca4 |
- /etc/NetworkManager/dispatcher.d
|
|
|
0acdca4 |
+ tests prefix/lib/NetworkManager/dispatcher.d and
|
|
|
0acdca4 |
+ /lib/NetworkManager/dispatcher.d
|
|
|
0acdca4 |
--with-netconfig-dispatch
|
|
|
0acdca4 |
Set the netconfig dhcp dispatcher dir, default tests
|
|
|
0acdca4 |
prefix/etc/netconfig.d and /etc/netconfig.d
|
|
|
0acdca4 |
@@ -6879,7 +6879,7 @@ if test -n "$withval"; then
|
|
|
0acdca4 |
fi
|
|
|
0acdca4 |
|
|
|
0acdca4 |
# hook settings
|
|
|
0acdca4 |
-networkmanager_dispatcher_dir="$sysconfdir/NetworkManager/dispatcher.d"
|
|
|
0acdca4 |
+networkmanager_dispatcher_dir="$prefix/lib/NetworkManager/dispatcher.d"
|
|
|
0acdca4 |
|
|
|
0acdca4 |
# Check whether --with-networkmanager-dispatch was given.
|
|
|
0acdca4 |
if test "${with_networkmanager_dispatch+set}" = set; then :
|
|
|
0acdca4 |
@@ -6938,8 +6938,8 @@ $as_echo_n "checking for NetworkManager dispatch... " >&6; }
|
|
|
0acdca4 |
else
|
|
|
0acdca4 |
if test -d "$networkmanager_dispatcher_dir" ; then
|
|
|
0acdca4 |
:
|
|
|
0acdca4 |
- else if test -d /etc/NetworkManager/dispatcher.d; then
|
|
|
0acdca4 |
- networkmanager_dispatcher_dir="/etc/NetworkManager/dispatcher.d"
|
|
|
0acdca4 |
+ else if test -d /lib/NetworkManager/dispatcher.d; then
|
|
|
0acdca4 |
+ networkmanager_dispatcher_dir="/lib/NetworkManager/dispatcher.d"
|
|
|
0acdca4 |
fi
|
|
|
0acdca4 |
fi
|
|
|
0acdca4 |
fi
|
|
|
0acdca4 |
diff --git a/configure.ac b/configure.ac
|
|
|
0acdca4 |
index f06412f..d1b8556 100644
|
|
|
0acdca4 |
--- a/configure.ac
|
|
|
0acdca4 |
+++ b/configure.ac
|
|
|
0acdca4 |
@@ -244,9 +244,9 @@ if test -n "$withval"; then
|
|
|
0acdca4 |
fi
|
|
|
0acdca4 |
|
|
|
0acdca4 |
# hook settings
|
|
|
0acdca4 |
-networkmanager_dispatcher_dir="$sysconfdir/NetworkManager/dispatcher.d"
|
|
|
0acdca4 |
+networkmanager_dispatcher_dir="$prefix/lib/NetworkManager/dispatcher.d"
|
|
|
0acdca4 |
AC_ARG_WITH([networkmanager-dispatch], AC_HELP_STRING([--with-networkmanager-dispatch],
|
|
|
0acdca4 |
- [Set the networkmanager dhcp dispatcher dir, default tests prefix/etc/NetworkManager/dispatcher.d and /etc/NetworkManager/dispatcher.d]),
|
|
|
0acdca4 |
+ [Set the networkmanager dhcp dispatcher dir, default tests prefix/lib/NetworkManager/dispatcher.d and /lib/NetworkManager/dispatcher.d]),
|
|
|
0acdca4 |
, withval="")
|
|
|
0acdca4 |
with_nm_dispatch="$withval"
|
|
|
0acdca4 |
AC_SUBST(networkmanager_dispatcher_dir)
|
|
|
0acdca4 |
@@ -290,8 +290,8 @@ if test "$hooks" = "networkmanager"; then
|
|
|
0acdca4 |
else
|
|
|
0acdca4 |
if test -d "$networkmanager_dispatcher_dir" ; then
|
|
|
0acdca4 |
:
|
|
|
0acdca4 |
- else if test -d /etc/NetworkManager/dispatcher.d; then
|
|
|
0acdca4 |
- networkmanager_dispatcher_dir="/etc/NetworkManager/dispatcher.d"
|
|
|
0acdca4 |
+ else if test -d /lib/NetworkManager/dispatcher.d; then
|
|
|
0acdca4 |
+ networkmanager_dispatcher_dir="/lib/NetworkManager/dispatcher.d"
|
|
|
0acdca4 |
fi
|
|
|
0acdca4 |
fi
|
|
|
0acdca4 |
fi
|
|
|
0acdca4 |
--
|
|
|
0acdca4 |
2.23.0
|
|
|
0acdca4 |
|