diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-03-08 14:36:58 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-03-08 14:36:58 -0500 |
| commit | 53010f05df012183a1f9d9e7ca684b5fe722563d (patch) | |
| tree | e1e0cc839b8517d9392787d79bf4265a5e6f9b33 /debian/patches | |
| parent | 9a04f21da9a5ab80d69c0d2832360d82c471916c (diff) | |
| parent | 0514770b02f34ccb56b6bc52010452663c6717ed (diff) | |
Merge tag 'debian/1.36.2-1' into ubuntu/master
network-manager Debian release 1.36.2-1
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index e009f715..4765891f 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 115 insertions(+) diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c -index b440b22..9b1057f 100644 +index 6c73d23..9a73a16 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -51,6 +51,8 @@ @@ -88,7 +88,7 @@ index b440b22..9b1057f 100644 + + channel = g_io_channel_new_file(IFUPDOWN_STATE_FILE, "r", NULL); + if (!channel) { -+ nm_log_warn(LOGD_CORE, "Error: failed to open %s", IFUPDOWN_STATE_FILE); ++ nm_log_info(LOGD_CORE, "failed to open %s", IFUPDOWN_STATE_FILE); + return; + } + @@ -146,7 +146,7 @@ index b440b22..9b1057f 100644 return TRUE; } -@@ -7967,6 +8056,22 @@ nm_manager_init(NMManager *self) +@@ -7984,6 +8073,22 @@ nm_manager_init(NMManager *self) _LOGW(LOGD_CORE, "failed to monitor kernel firmware directory '%s'.", KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index b440b22..9b1057f 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds(300, -@@ -8252,6 +8357,16 @@ dispose(GObject *object) +@@ -8269,6 +8374,16 @@ dispose(GObject *object) g_clear_object(&priv->fw_monitor); } |