diff options
| author | Michael Biebl <biebl@debian.org> | 2021-10-01 23:06:08 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2021-10-01 23:06:08 +0200 |
| commit | a3349a04ac4c38885cddefec8515c979d03f9327 (patch) | |
| tree | d3bbee695aa048cb4ec252e7d63515c8376f9006 /src/core/main.c | |
| parent | 2d5b58e374d67f60880c7689e80c7745aeef3f62 (diff) | |
| parent | e74c568b07b50b97873fb4ee1d776dedefbd54d6 (diff) | |
Update upstream source from tag 'upstream/1.32.12'
Update to upstream version '1.32.12' with Debian dir 6fabefa95c7dcf83371a78eb2c47013a81ff8d86
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/main.c b/src/core/main.c index 9b79bcbb..3cb5c07f 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -12,6 +12,7 @@ #include <signal.h> #include <unistd.h> #include <fcntl.h> +#include <linux/if.h> #include <sys/stat.h> #include <sys/types.h> #include <sys/resource.h> @@ -20,7 +21,7 @@ #include "nm-dbus-interface.h" #include "NetworkManagerUtils.h" #include "nm-manager.h" -#include "platform/nm-linux-platform.h" +#include "libnm-platform/nm-linux-platform.h" #include "nm-dbus-manager.h" #include "devices/nm-device.h" #include "dhcp/nm-dhcp-manager.h" @@ -29,11 +30,11 @@ #include "nm-dispatcher.h" #include "settings/nm-settings.h" #include "nm-auth-manager.h" -#include "nm-core-internal.h" +#include "libnm-core-intern/nm-core-internal.h" #include "nm-dbus-object.h" #include "nm-connectivity.h" #include "dns/nm-dns-manager.h" -#include "systemd/nm-sd.h" +#include "libnm-systemd-core/nm-sd.h" #include "nm-netns.h" #if !defined(NM_DIST_VERSION) @@ -303,14 +304,14 @@ main(int argc, char *argv[]) const char *const * warnings; int errsv; + _nm_utils_is_manager_process = TRUE; + /* Known to cause a possible deadlock upon GDBus initialization: * https://bugzilla.gnome.org/show_bug.cgi?id=674885 */ g_type_ensure(G_TYPE_SOCKET); g_type_ensure(G_TYPE_DBUS_CONNECTION); g_type_ensure(NM_TYPE_DBUS_MANAGER); - _nm_utils_is_manager_process = TRUE; - main_loop = g_main_loop_new(NULL, FALSE); /* we determine a first-start (contrary to a restart during the same boot) @@ -508,7 +509,7 @@ main(int argc, char *argv[]) * physical interfaces. */ nm_log_dbg(LOGD_CORE, "setting up local loopback"); - nm_platform_link_set_up(NM_PLATFORM_GET, 1, NULL); + nm_platform_link_change_flags(NM_PLATFORM_GET, 1, IFF_UP, TRUE); success = TRUE; |