Merge lp:~didrocks/ubiquity/fix-crash-on-reboot into lp:ubiquity

[Didier Roche-Tolomelli]

[Didier Roche-Tolomelli (didrocks)]

Tested in live session, selecting reboot once install is done. Works.

[Sebastien Bacher (seb128)]

Works fine in ubiquity-dm as well and makes sense from a code review

review: Approve

[Jean-Baptiste Lallement (jibel)]

Verified from the live session and ubiquity-only mode. Both are working.

review: Approve

[lp:~didrocks/ubiquity/fix-crash-on-reboot]

6632. By Didier Roche-Tolomelli on 2018-04-25

Remove broken gnome-session code completely

[Iain Lane (laney)]

thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-24 15:29:36 +0000
+++ debian/changelog	2018-04-25 09:24:42 +0000
@@ -1,3 +1,14 @@
+ubiquity (18.04.12) UNRELEASED; urgency=medium
+
+  * Request shutdown and reboot without using gnome-session (LP: #1766811)
+    The if gnome_session code path doesn't declare the GNOME
+    session interface it's using, so don't work.
+    Even fixing it, we notice that calls aren't wired in GNOME session code.
+    Fallback thus for now to old code path which is executed at least
+    since xenial (when DBUS address wasn't correct in ubiquity process)
+
+ -- Didier Roche <[e-mail]>  Wed, 25 Apr 2018 10:14:19 +0200
+
 ubiquity (18.04.11) bionic; urgency=medium
 
   [ Sebastien Bacher]

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2018-04-24 13:52:00 +0000
+++ ubiquity/frontend/gtk_ui.py	2018-04-25 09:24:42 +0000
@@ -1407,45 +1407,23 @@
 
     def do_reboot(self):
         """Callback for main program to actually reboot the machine."""
-        try:
-            session = dbus.Bus.get_session()
-            gnome_session = session.name_has_owner('org.gnome.SessionManager')
-        except dbus.exceptions.DBusException:
-            gnome_session = False
-
-        if gnome_session:
-            manager = session.get_object('org.gnome.SessionManager',
-                                         '/org/gnome/SessionManager')
-            manager.RequestReboot()
-        else:
-            # don't let reboot race with the shutdown of X in ubiquity-dm;
-            # reboot might be too fast and X will stay around forever instead
-            # of moving to plymouth
-            misc.execute_root(
-                "sh", "-c",
-                "if ! service display-manager status; then killall Xorg; "
-                "while pidof X; do sleep 0.5; done; fi; reboot")
+        # don't let reboot race with the shutdown of X in ubiquity-dm;
+        # reboot might be too fast and X will stay around forever instead
+        # of moving to plymouth
+        misc.execute_root(
+            "sh", "-c",
+            "if ! service display-manager status; then killall Xorg; "
+            "while pidof X; do sleep 0.5; done; fi; reboot")
 
     def do_shutdown(self):
         """Callback for main program to actually shutdown the machine."""
-        try:
-            session = dbus.Bus.get_session()
-            gnome_session = session.name_has_owner('org.gnome.SessionManager')
-        except dbus.exceptions.DBusException:
-            gnome_session = False
-
-        if gnome_session:
-            manager = session.get_object('org.gnome.SessionManager',
-                                         '/org/gnome/SessionManager')
-            manager.RequestShutdown()
-        else:
-            # don't let poweroff race with the shutdown of X in ubiquity-dm;
-            # poweroff might be too fast and X will stay around forever instead
-            # of moving to plymouth
-            misc.execute_root(
-                "sh", "-c",
-                "if ! service display-manager status; then killall Xorg; "
-                "while pidof X; do sleep 0.5; done; fi; poweroff")
+        # don't let poweroff race with the shutdown of X in ubiquity-dm;
+        # poweroff might be too fast and X will stay around forever instead
+        # of moving to plymouth
+        misc.execute_root(
+            "sh", "-c",
+            "if ! service display-manager status; then killall Xorg; "
+            "while pidof X; do sleep 0.5; done; fi; poweroff")
 
     def quit_installer(self, *args):
         """Quit installer cleanly."""