diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 41 deletions
diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch deleted file mode 100644 index 098e89d7..00000000 --- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Michael Biebl <biebl@debian.org> -Date: Sat, 12 Apr 2014 12:38:09 +0200 -Subject: Don't setup Sleep Monitor if not booted with systemd - -NetworkManager uses systemd for suspend/resume support. It listens for -the PrepareForSleep and Resume D-Bus signal sent by logind/systemd and -deactivates the interfaces on sleep and reactivates them on resume. -With a standalone logind we don't get a Resume signal and -NetworkManager remains in sleep mode where the devices are unmanaged. -As a workaround, skip the Sleep Monitor setup if not booted with -systemd. - -Closes: #742933 ---- - src/nm-sleep-monitor.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c -index c16dc07..cb2ca21 100644 ---- a/src/nm-sleep-monitor.c -+++ b/src/nm-sleep-monitor.c -@@ -10,6 +10,7 @@ - - #include <sys/stat.h> - #include <gio/gunixfdlist.h> -+#include <systemd/sd-daemon.h> - - #include "nm-core-internal.h" - #include "NetworkManagerUtils.h" -@@ -329,6 +330,10 @@ on_proxy_acquired (GObject *object, - static void - nm_sleep_monitor_init (NMSleepMonitor *self) - { -+ if (!sd_booted()) { -+ nm_log_warn (LOGD_SUSPEND, "Skipping Sleep Monitor setup, system not booted with systemd"); -+ return; -+ } - self->inhibit_fd = -1; - self->cancellable = g_cancellable_new (); - g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, diff --git a/debian/patches/series b/debian/patches/series index 9a20acf2..a2d7e06d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ Force-online-state-with-unmanaged-devices.patch -Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch |