fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-20 14:10:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: merge branch 'th/build-runstatedir'

Browse source 
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/145
This commit is contained in:
Thomas Haller 2019-05-17 21:34:02 +02:00
commit e966f942cc
11 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -127,7 +127,6 @@ config-extra.h: Makefile
echo "#define NM_BUILD_SRCDIR \"$(abs_srcdir)\"" >>$@ && \
echo "#define PPPD_PLUGIN_DIR \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \
echo "#define PREFIX \"$(prefix)\"" >>$@ && \
echo "#define RUNDIR \"$(rundir)\"" >>$@ && \
echo "#define RUNSTATEDIR \"$(runstatedir)\"" >>$@ && \
echo "#define SYSCONFDIR \"$(sysconfdir)\"" >>$@ && \
true

1
config-extra.h.meson
View file

@ -13,6 +13,5 @@
#mesondefine NM_BUILD_SRCDIR
#mesondefine PPPD_PLUGIN_DIR
#mesondefine PREFIX
#mesondefine RUNDIR
#mesondefine RUNSTATEDIR
#mesondefine SYSCONFDIR

9
configure.ac
View file

@ -115,7 +115,14 @@ GETTEXT_PACKAGE=NetworkManager
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
# Add runstatedir if not specified manually in autoconf < 2.70
# autoconf 2.70 adds option --runstatedir. To make the directory also configurable
# on older versions, add --with-runstatedir option. Note that this option overwrites
# --runstatedir (should it be set). If you know to use autoconf >= 2.70, you should
# instead use --runstatedir.
AC_ARG_WITH([runstatedir],
AS_HELP_STRING([--with-runstatedir=DIR],
[Directory for /var/run. Defaults to $localstatedir/run. In autoconf >= 2.70, you should instead use --runstatedir option. This option takes precedence over --runstatedir.]),
[runstatedir="$withval"])
AS_IF([test -z "$runstatedir"], runstatedir="$localstatedir/run")
AC_SUBST(runstatedir)

6
contrib/fedora/rpm/NetworkManager.conf
View file

@ -2,7 +2,7 @@
#
# See "man 5 NetworkManager.conf" for details.
#
# The directories /usr/lib/NetworkManager/conf.d/ and /var/run/NetworkManager/conf.d/
# The directories /usr/lib/NetworkManager/conf.d/ and /run/NetworkManager/conf.d/
# can contain additional configuration snippets installed by packages. These files are
# read before NetworkManager.conf and have thus lowest priority.
# The directory /etc/NetworkManager/conf.d/ can contain additional configuration
@ -15,7 +15,7 @@
# /usr/lib/NetworkManager/conf.d/, the latter file is shadowed and thus ignored.
# Hence, to disable loading a file from /usr/lib/NetworkManager/conf.d/ you can
# put an empty file to /etc with the same name. The same applies with respect
# to the directory /var/run/NetworkManager/conf.d where files in /var/run shadow
# to the directory /run/NetworkManager/conf.d where files in /run shadow
# /usr/lib and are themselves shadowed by files under /etc.
#
# If two files define the same key, the one that is read afterwards will overwrite
@ -44,7 +44,7 @@
#
# Note that debug logging of NetworkManager can be quite verbose. Some messages
# might be rate-limited by the logging daemon (see RateLimitIntervalSec, RateLimitBurst
# in man journald.conf).
# in man journald.conf). Please disable rate-limiting before collecting debug logs.
#
#level=TRACE
#domains=ALL

1
contrib/fedora/rpm/NetworkManager.spec
View file

@ -599,6 +599,7 @@ gtkdocize
autoreconf --install --force
intltoolize --automake --copy --force
%configure \
--with-runstatedir=/run \
--disable-silent-rules \
--disable-static \
--with-dhclient=yes \

2
contrib/scripts/test-macsec
View file

@ -46,7 +46,7 @@ ip -n macsec-ns link set macsec-vethp up
echo "* Start wpa_supplicant..."
cat <<EOF > $TMPDIR/wpa_supplicant.conf
ctrl_interface=/var/run/hostapd1
ctrl_interface=/run/hostapd1
eapol_version=3
ap_scan=0
fast_reauth=1

4
meson.build
View file

@ -862,7 +862,6 @@ config_extra_h.set_quoted('LIBEXECDIR', nm_libexecdir)
config_extra_h.set_quoted('LOCALSTATEDIR', nm_localstatedir)
config_extra_h.set_quoted('NMCONFDIR', nm_pkgconfdir)
config_extra_h.set_quoted('NMLIBDIR', nm_pkglibdir)
config_extra_h.set_quoted('NMLIBDIR', nm_pkglibdir)
config_extra_h.set_quoted('NMLOCALEDIR', nm_localedir)
config_extra_h.set_quoted('NMPLUGINDIR', nm_plugindir)
config_extra_h.set_quoted('NMRUNDIR', nm_pkgrundir)
@ -871,10 +870,9 @@ config_extra_h.set_quoted('NMVPNDIR', nm_vpndir)
config_extra_h.set_quoted('NM_BUILD_BUILDDIR', meson.build_root())
config_extra_h.set_quoted('NM_BUILD_SRCDIR', meson.source_root())
if enable_ppp
config_extra_h.set_quoted('PPPD_PLUGIN_DIR', pppd_plugin_dir)
config_extra_h.set_quoted('PPPD_PLUGIN_DIR', pppd_plugin_dir)
endif
config_extra_h.set_quoted('PREFIX', nm_prefix)
config_extra_h.set_quoted('RUNDIR', nm_pkgrundir)
config_extra_h.set_quoted('RUNSTATEDIR', nm_runstatedir)
config_extra_h.set_quoted('SYSCONFDIR', nm_sysconfdir)

4
src/dhcp/nm-dhcp-dhcpcd.c
View file

@ -100,9 +100,9 @@ ip4_start (NMDhcpClient *client,
iface = nm_dhcp_client_get_iface (client);
/* dhcpcd does not allow custom pidfiles; the pidfile is always
* RUNDIR "dhcpcd-<ifname>.pid".
* RUNSTATEDIR "dhcpcd-<ifname>.pid".
*/
priv->pid_file = g_strdup_printf (RUNDIR "/dhcpcd-%s.pid", iface);
priv->pid_file = g_strdup_printf (RUNSTATEDIR "/dhcpcd-%s.pid", iface);
dhcpcd_path = nm_dhcp_dhcpcd_get_path ();
if (!dhcpcd_path) {

2
src/nm-config.c
View file

@ -67,7 +67,7 @@ struct NMConfigCmdLineOptions {
*
* It is true, if NM is started the first time -- contrary to a restart
* during the same boot up. That is determined by the content of the
* /var/run/NetworManager state directory. */
* /run/NetworManager state directory. */
bool first_start;
};

2
src/nm-session-monitor.c
View file

@ -44,7 +44,7 @@
#define SESSION_TRACKING_XLOGIND (SESSION_TRACKING_SYSTEMD || SESSION_TRACKING_ELOGIND)
#define CKDB_PATH "/var/run/ConsoleKit/database"
#define CKDB_PATH "/run/ConsoleKit/database"
/*****************************************************************************/

6
src/platform/tests/test-link.c
View file

@ -2765,9 +2765,9 @@ test_netns_push (gpointer fixture, gconstpointer test_data)
static void
test_netns_bind_to_path (gpointer fixture, gconstpointer test_data)
{
#define P_VAR_RUN "/var/run"
#define P_VAR_RUN_NETNS "/var/run/netns"
#define P_VAR_RUN_NETNS_BINDNAME "/var/run/netns/"P_NETNS_BINDNAME
#define P_VAR_RUN "/run"
#define P_VAR_RUN_NETNS "/run/netns"
#define P_VAR_RUN_NETNS_BINDNAME "/run/netns/"P_NETNS_BINDNAME
#define P_NETNS_BINDNAME "nmtst-iproute2-netns"
gs_unref_object NMPlatform *platform_0 = NULL;
gs_unref_object NMPlatform *platform_1 = NULL;