Ticket #615: sugar-shutdown-no-hal-fallback.patch

src/jarabe/model/session.py

@@ -18 +18 @@
 import dbus
 import os
 import signal
+import subprocess
 import sys
 
 from sugar import session
@@ -46 +47 @@
         self._logout_mode = self.MODE_REBOOT
         self.initiate_shutdown()
 
+    _shutdownProgramMap = {MODE_SHUTDOWN: 'poweroff', MODE_REBOOT: 'reboot'}
+    def lowlevel_shutdown(self, mode) :
+        """
+        Will cause the init system to do a shutdown or reboot (according to <mode>).
+        HAL is tried first, sudo poweroff / reboot second.
+        """
+        assert (mode in [self.MODE_SHUTDOWN, self.MODE_REBOOT])
+
+        try :
+            bus = dbus.SystemBus()
+            proxy = bus.get_object('org.freedesktop.Hal', 
+                                   '/org/freedesktop/Hal/devices/computer')
+            pm = dbus.Interface(proxy, \
+                                'org.freedesktop.Hal.Device.SystemPowerManagement') 
+    
+            if mode == self.MODE_SHUTDOWN:
+                pm.Shutdown()
+            elif mode == self.MODE_REBOOT:
+                pm.Reboot()
+
+        except dbus.exceptions.DBusException :
+            # try old-school System V tools as fallback
+            subprocess.check_call(['sudo', self._shutdownProgramMap[mode]])
+
     def shutdown_completed(self):
         session.SessionManager.shutdown_completed(self)
 
-        bus = dbus.SystemBus()
-        proxy = bus.get_object('org.freedesktop.Hal', 
-                               '/org/freedesktop/Hal/devices/computer')
-        pm = dbus.Interface(proxy, \
-                            'org.freedesktop.Hal.Device.SystemPowerManagement') 
-
         if env.is_emulator():
+            # never returns
             self._close_emulator()
-        else:
-            if self._logout_mode == self.MODE_SHUTDOWN:
-                pm.Shutdown()
-            elif self._logout_mode == self.MODE_REBOOT:
-                pm.Reboot()
 
-            gtk.main_quit()
+        if (self._logout_mode != self.MODE_LOGOUT) :
+            self.lowlevel_shutdown(self._logout_mode)
+
+        gtk.main_quit()
 
     def _close_emulator(self):
         gtk.main_quit()