diff options
| author | Pavel Šimerda <psimerda@redhat.com> | 2012-08-23 11:53:41 +0200 |
|---|---|---|
| committer | Pavel Šimerda <psimerda@redhat.com> | 2012-11-05 14:01:47 +0100 |
| commit | d82669d3fdaa7ec70ef1b64941c101ac810c394b (patch) | |
| tree | 02556450a8dcb124b9ad1a8ccce8f25fc87586c6 /callouts | |
| parent | 811c87f8ae4c2d24fc0c40e8158cd5fe66475ec8 (diff) | |
build: unify NetworkManager path handling (some paths are changed)
Use autoconf/automake variables for NetworkManager paths. Use
NetworkManager subdirectory where appropriate.
Files in /var/run (or /run on some distros) are moved into a separate
directory as is usual with other daemons. It makes the filesystem
more readable and file prefixing unnecessary.
/var/run/NetworkManager.pid -> /var/run/NetworkManager/NetworkManager.pid
/var/run/nm-dns-dnsmasq.pid -> /var/run/NetworkManager/dnsmasq.pid
/var/run/nm-dns-dnsmasq.conf -> /var/run/NetworkManager/dnsmasq.conf
The /var/run/NetworkManager directory is created at runtime, if it doesn't
exist.
Note: Path-based security policies like SELinux and AppArmor may need to
be adapted.
Diffstat (limited to 'callouts')
| -rw-r--r-- | callouts/Makefile.am | 4 | ||||
| -rw-r--r-- | callouts/nm-dispatcher-action.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 5cc804a0db..d7fbec01eb 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -24,7 +24,7 @@ nm_dhcp_client_action_SOURCES = \ nm_dhcp_client_action_CPPFLAGS = \ $(DBUS_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" nm_dhcp_client_action_LDADD = $(DBUS_LIBS) @@ -58,7 +58,7 @@ nm_dispatcher_action_CPPFLAGS = \ -I${top_builddir}/libnm-util \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DNMCONFDIR=\"$(nmconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" nm_dispatcher_action_LDADD = \ diff --git a/callouts/nm-dispatcher-action.c b/callouts/nm-dispatcher-action.c index ee80316c14..0e4b11a7c7 100644 --- a/callouts/nm-dispatcher-action.c +++ b/callouts/nm-dispatcher-action.c @@ -39,7 +39,7 @@ #include "nm-dispatcher-action.h" #include "nm-dispatcher-utils.h" -#define NMD_SCRIPT_DIR SYSCONFDIR "/NetworkManager/dispatcher.d" +#define NMD_SCRIPT_DIR NMCONFDIR "/dispatcher.d" static GMainLoop *loop = NULL; static gboolean debug = FALSE; |