Merge ~albertomilone/ubuntu/+source/gdm3/+git/gdm3:lp1778011 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master

[Alberto Milone]

ubuntu_nvidia_prime.patch: run scripts for Prime before and after Gdm sessions (LP: #1778011).

The original patch called the script only when the X session ended (on_x_server_finished). For some reason that didn't really happen when closing an X session in Gdm 3. Calling the script in gdm_session_close() seems to be much more reliable.

[Marco Trevisan (Treviño) (3v1n0)]

LGTM

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 305efcb..0106726 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gdm3 (3.28.2-3ubuntu2) UNRELEASED; urgency=medium
+
+  [ Alberto Milone ]
+  * ubuntu_nvidia_prime.patch:
+    - Run scripts for Prime before and after Gdm sessions (LP: #1778011).
+
+ -- Alberto Milone <[e-mail]>  Mon, 30 Jul 2018 18:31:17 +0200
+
 gdm3 (3.28.2-3ubuntu1) cosmic; urgency=medium
 
   * Merge with Debian. Remaining changes:
diff --git a/debian/patches/ubuntu_nvidia_prime.patch b/debian/patches/ubuntu_nvidia_prime.patch
index 64b36f0..27fcf5f 100644
--- a/debian/patches/ubuntu_nvidia_prime.patch
+++ b/debian/patches/ubuntu_nvidia_prime.patch
@@ -1,15 +1,17 @@
 From: Tim Lunn <[e-mail]>
 Date: Sat, 22 Mar 2014 00:23:12 +0100
-Subject: Add hook to run prime-offload (as root) move Prime helpers into the
- gdm-x-session wrapper
+Subject: Add hooks to run prime scripts (as root) before and after a
+ gdm-session
 
+This allows enabling and disabling the dGPU on log out.
 ---
  common/gdm-common.c    |  2 +-
- daemon/gdm-x-session.c | 10 ++++++++++
+ daemon/gdm-session.c   |  6 ++++++
+ daemon/gdm-x-session.c |  5 +++++
  data/Makefile.am       | 28 ++++++++++++++++++++++++++--
  data/Prime             |  6 ++++++
  data/PrimeOff          |  6 ++++++
- 5 files changed, 49 insertions(+), 3 deletions(-)
+ 6 files changed, 50 insertions(+), 3 deletions(-)
  create mode 100644 data/Prime
  create mode 100644 data/PrimeOff
 
@@ -26,23 +28,28 @@ index c44fa99..a9902c3 100644
                                            display_name,
                                            display_hostname,
                                            display_x11_authority_file);
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index 19d26c9..e390130 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -2865,6 +2865,12 @@ gdm_session_close (GdmSession *self)
+ 
+         g_list_free_full (self->priv->outside_connections, g_object_unref);
+         self->priv->outside_connections = NULL;
++
++        /* Run PrimeOff after the session is closed */
++        gdm_run_script (GDMCONFDIR "/PrimeOff", "root",
++                        NULL,
++                        NULL,
++                        NULL);
+ }
+ 
+ void
 diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
-index 3b2fcef..08ac5ab 100644
+index 3b2fcef..9a57300 100644
 --- a/daemon/gdm-x-session.c
 +++ b/daemon/gdm-x-session.c
-@@ -172,6 +172,11 @@ on_x_server_finished (GSubprocess  *subprocess,
-         if (cancelled) {
-                 goto out;
-         }
-+        gdm_run_script (GDMCONFDIR "/PrimeOff", "root",
-+                       state->display_name,
-+                       NULL, /* hostname */
-+                       state->auth_file);
-+
- 
-         if (g_subprocess_get_if_exited (subprocess)) {
-                 int exit_status;
-@@ -614,6 +619,11 @@ spawn_session (State        *state,
+@@ -614,6 +614,11 @@ spawn_session (State        *state,
  
          g_debug ("Running X session");