summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2010-06-12 04:34:29 -0500
committer Robby Workman <rworkman@slackbuilds.org>2010-06-12 07:47:27 -0500
commit26ba48d1f07fc4c8b35ea69394369fd00083a03a (patch)
treea979349801079cce2b6625462587ee5e9c1173a2
parent12f03ef460bb29eb415fcce89bc2d43c0d84aa84 (diff)
downloadslackbuilds-26ba48d1f07fc4c8b35ea69394369fd00083a03a.tar.gz
slackbuilds-26ba48d1f07fc4c8b35ea69394369fd00083a03a.tar.xz
system/gdm: Added notes about xinitrc files and consolekit.
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--system/gdm/README2
-rw-r--r--system/gdm/README.SLACKWARE32
-rw-r--r--system/gdm/gdm.SlackBuild1
3 files changed, 35 insertions, 0 deletions
diff --git a/system/gdm/README b/system/gdm/README
index dbca3fde17..118dc4ea64 100644
--- a/system/gdm/README
+++ b/system/gdm/README
@@ -6,4 +6,6 @@ If you want xscreensaver to recognize gdm and add a "New Login" button
to the unlock screen, add this line to your ~/.xscreensaver file:
newLoginCommand: gdmflexiserver -ls
+See README.SLACKWARE for some (hopefully) soon to be outdated information.
+
This requires libgnomecanvas.
diff --git a/system/gdm/README.SLACKWARE b/system/gdm/README.SLACKWARE
new file mode 100644
index 0000000000..6233b97c99
--- /dev/null
+++ b/system/gdm/README.SLACKWARE
@@ -0,0 +1,32 @@
+Since Slackware now includes polkit and consolekit, gdm will "poke" consolekit
+when your session starts. This is a good thing, but since Slackware patched
+the system xinitrc scripts so start kde and xfce with ck-launch-session, you
+will notice that there are now *two* registered consolekit sessions (using
+ck-list-sessions). You will also notice that one of them is marked as
+inactive, and polkit is setup so that inactive sessions are not allowed to
+do anything (there's not even an opportunity to authenticate). Therefore,
+anything parented from that inactive session is not going to be able to
+authenticate using polkit.
+
+Thankfully, there's an easy solution: edit the kde and xfce xinitrc scripts
+to look like this at the relevant spots:
+
+In /etc/X11/xinit/xinitrc.xfce:
+ if [ -z $DESKTOP_SESSION ]; then
+ ck-launch-session $xfcesm
+ else
+ $xfcesm
+ fi
+
+In /etc/X11/xinit/xinitrc.kde:
+ # Start the window manager:
+ if [ -z $DESKTOP_SESSION ]; then
+ ck-launch-session startkde
+ else
+ startkde
+ fi
+
+This will cause sessions launched from gdm and kdm to *not* call
+ck-launch-session when invoking the relevant desktop environment.
+Pat is aware of this and will hopefully be getting fixes in /patches :-)
+
diff --git a/system/gdm/gdm.SlackBuild b/system/gdm/gdm.SlackBuild
index 418279c1e1..3d11815555 100644
--- a/system/gdm/gdm.SlackBuild
+++ b/system/gdm/gdm.SlackBuild
@@ -100,6 +100,7 @@ cp -a \
AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README* TODO docs/C/* \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc