Merge lp:~darkxst/ubuntu-release-upgrader/gnome-session-inhibit into lp:ubuntu-release-upgrader

[Tim Lunn]

This branch should fix the disabling of the screensaver on Ubuntu GNOME (and any other gnome-session based DE). Although I couldnt test it properly, not sure how the quirks get pulled in. Update-manager doesnt use the locally installed quirks?

[Brian Murray (brian-murray)]

The release upgrade process downloads a tarball of the release-upgrader from the archive for the target release e.g. http://archive.ubuntu.com/ubuntu/dists/xenial/main/dist-upgrader-all/current/xeinal.tar.gz then extracts it to a directory in /tmp/ and then runs xenial in that temporary directory. You could test it by either starting an upgrade, choosing to quit, and then make changes in /tmp/$tmpdir/DistUpgradeQuirks.py or build the package and manually extract dist-upgrader_$vernum.tar.gz.

[Tim Lunn (darkxst)]

ok, managed to test it.

It didnt work though since the quirks are run under sudo, there is no access to the user dbus session.

[Tim Lunn (darkxst)]

This is fixed now, it kind of feels like jumping through hoops, but I am not sure there is a better way. This is not possible with logind inhibitors and we need the gnome-session-inhibit binary launched with the users (not root) environment and uid.

[Mathieu Trudel-Lapierre (cyphermox)]

Since Brian uploaded a change with a sleep inhibitor using logind, I'm thinking this might be better handled by inhibiting "idle" as well in logind? This would fix the screensaver coming on for Kubuntu as well as the gnome-session-based flavors.

review: Needs Fixing

[Tim Lunn (darkxst)]

That was my patch and I would have included an inhibitor on idle if it worked like that.

Atleast on GNOME (although its likely the same on KDE), the logind "idle" inhibitors do not inhibit the idle monitors within the compositor. logind only deals with system level events/actions like shutdown/sleep, power buttons and lid switch, it has no concept of what his happening within the users session. Its the compositor that is monitoring user input (keyboard/mouse etc) and deciding when to activate the screensaver and screenblanking.

So we still need to install an "idle" inhibitor into the users session.

[Brian Murray (brian-murray)]

I'm testing this a bit and will upload / merge it today.

=== modified file 'DistUpgrade/DistUpgradeQuirks.py'
--- DistUpgrade/DistUpgradeQuirks.py	2016-03-30 03:39:16 +0000
+++ DistUpgrade/DistUpgradeQuirks.py	2016-04-05 10:09:56 +0000
@@ -60,6 +60,8 @@
         self.arch = get_arch()
         self.plugin_manager = PluginManager(self.controller, ["./plugins"])
         self._poke = None
+        self._uid = os.environ['SUDO_UID']
+        self._user_env = {}
 
     # the quirk function have the name:
     #  $Name (e.g. PostUpgrade)
@@ -135,6 +137,7 @@
         self._killKBluetooth()
         self._killScreensaver()
         self._pokeScreensaver()
+        self._inhibitIdle()
         self._stopDocvertConverter()
         self._fixupDbusDaemonLaunchHelperPerms()
 
@@ -405,6 +408,42 @@
             except:
                 logging.exception("failed to setup screensaver poke")
 
+    def _getUserEnv(self):
+        try:
+            pid = subprocess.check_output(["pgrep","-u",self._uid,
+                                           "gnome-session"])
+            pid = pid.decode().split('\n')[0]
+            with open('/proc/'+pid+'/environ','r') as f:
+                data = f.read().split('\x00')
+            for line in data:
+                if len(line):
+                    env = line.split('=', 1)
+                    self._user_env[env[0]] = env[1]
+        except:
+            logging.exception("failed to read user env")
+
+    def _inhibitIdle(self):
+        if os.path.exists("/usr/bin/gnome-session-inhibit"):
+            self._getUserEnv()
+            #seteuid so dbus user session can be accessed
+            os.seteuid(int(self._uid))
+        
+            logging.debug("inhibit gnome-session idle")
+            try:
+                idle = subprocess.Popen(["gnome-session-inhibit","--inhibit", 
+                                          "idle", "--inhibit-only"],
+                                          env=self._user_env)
+                # leave the inhibitor in place on Ubuntu GNOME, since the
+                # lock screen will be broken after upgrade (LP :#1565178)
+                xdg_desktop = self._user_env["XDG_CURRENT_DESKTOP"].split(':')
+                for desktop in xdg_desktop:
+                    if "GNOME" not in desktop:
+                        atexit.register(idle.terminate);
+            except:
+                logging.exception("failed to inhibit gnome-session idle")
+            os.seteuid(os.getuid())
+
+
     def _stopPokeScreensaver(self):
         res = False
         if self._poke is not None:

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-30 03:39:16 +0000
+++ debian/changelog	2016-04-05 10:09:56 +0000
@@ -1,5 +1,6 @@
 ubuntu-release-upgrader (1:16.04.9) UNRELEASED; urgency=medium
 
+  [ Mathieu Trudel-Lapierre ]
   * DistUpgrade/DistUpgradeController.py: fix typo in variable name for
     RELEASE_UPGRADER_ALLOW_THIRD_PARTY; this will help running with third-
     party mirrors in sources via just the environment variable for one-shot
@@ -10,7 +11,13 @@
     since the upgrade might try to reload dbus a few times before the postinst
     actually runs.
 
- -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 29 Mar 2016 23:18:01 -0400
+  [ Tim Lunn ]
+  * DistUpgradeQuirks.py: add a quirk to add a gnome-session idle inhibitor
+    this will fix the screensaver activating on Ubuntu GNOME (LP: #1565177)
+    Leave this inhibitor in place on GNOME desktop to workaround broken
+    lock screen after upgrade (LP: #1565178)
+
+ -- Tim Lunn <[e-mail]>  Sat, 02 Apr 2016 14:28:20 +1100
 
 ubuntu-release-upgrader (1:16.04.8) xenial; urgency=medium