[Code-review] Fix ConsoleKit integration

Marco Pesenti Gritti mpgritti at gmail.com
Tue Jun 24 07:30:04 EDT 2008


The following patch fix ConsoleKit integration.

You can see an explanation of why it's broken here:

http://lists.laptop.org/pipermail/devel/2008-June/015588.html

This fixes a couple of bugs at least:

http://dev.laptop.org/ticket/7266
http://dev.laptop.org/ticket/7289

See my notes on the tickets if you want to test it out (there are some
caveats with the policies).

The patch is a bit of stop-gap.  /etc/X11/xinit/xinitrc does useful
stuff and it sucks a bit that we are bypassing it (if we wasn't we
would have not wasted so much time to track this down...).

I think longer term we probably should:

1 Make /etc/X11/xinit/Xclients support sugar
2 Get rid of /usr/bin/olpc-session, by moving it into /usr/bin/sugar
3 Make olpc-dm just "startx"

I'm going to send a patch upstream for 1 because I need it also for
the livecd. If it's accepted and there is agreement we can later do 2
and 3.

Marco

diff --git a/olpc-session b/olpc-session
index 81167dd..9073067 100755
--- a/olpc-session
+++ b/olpc-session
@@ -65,4 +65,4 @@ mv $HOME/.boot_time $HOME/.boot_time.prev 2>/dev/null
 cat /proc/uptime >$HOME/.boot_time

 # finally, run sugar
-exec /usr/bin/sugar
+exec ck-xinit-session /usr/bin/sugar


More information about the Code-review mailing list