From 7b99ac06d6277d371f5b01c91d50cc7a724239c4 Mon Sep 17 00:00:00 2001 From: frank Date: Mon, 16 Jan 2012 00:55:03 +0100 Subject: [PATCH] committing changes in /etc after emerge run Package changes: +sys-auth/consolekit-0.4.5-r1 --- .etckeeper | 10 ++ .../run-session.d/.keep_sys-auth_consolekit-0 | 0 ConsoleKit/seats.d/00-primary.seat | 5 + X11/xinit/xinitrc.d/90-consolekit | 32 ++++ dbus-1/system.d/ConsoleKit.conf | 147 ++++++++++++++++++ init.d/consolekit | 24 +++ 6 files changed, 218 insertions(+) create mode 100644 ConsoleKit/run-session.d/.keep_sys-auth_consolekit-0 create mode 100644 ConsoleKit/seats.d/00-primary.seat create mode 100755 X11/xinit/xinitrc.d/90-consolekit create mode 100644 dbus-1/system.d/ConsoleKit.conf create mode 100755 init.d/consolekit diff --git a/.etckeeper b/.etckeeper index 248f1fe5..a7091436 100755 --- a/.etckeeper +++ b/.etckeeper @@ -1,5 +1,6 @@ # Generated by etckeeper. Do not edit. +mkdir -p './ConsoleKit/run-seat.d' mkdir -p './ca-certificates/update.d' mkdir -p './polkit-1/localauthority/10-vendor.d' mkdir -p './polkit-1/localauthority/20-org.d' @@ -15,6 +16,12 @@ maybe chmod 0755 '.' maybe chmod 0700 './.etckeeper' maybe chmod 0644 './.gitignore' maybe chmod 0600 './.pwd.lock' +maybe chmod 0755 './ConsoleKit' +maybe chmod 0755 './ConsoleKit/run-seat.d' +maybe chmod 0755 './ConsoleKit/run-session.d' +maybe chmod 0644 './ConsoleKit/run-session.d/.keep_sys-auth_consolekit-0' +maybe chmod 0755 './ConsoleKit/seats.d' +maybe chmod 0644 './ConsoleKit/seats.d/00-primary.seat' maybe chmod 0644 './DIR_COLORS' maybe chmod 0755 './X11' maybe chmod 0755 './X11/mwm' @@ -22,6 +29,7 @@ maybe chmod 0644 './X11/mwm/system.mwmrc' maybe chmod 0755 './X11/xinit' maybe chmod 0755 './X11/xinit/xinitrc.d' maybe chmod 0755 './X11/xinit/xinitrc.d/80-dbus' +maybe chmod 0755 './X11/xinit/xinitrc.d/90-consolekit' maybe chmod 0600 './aiccu.conf' maybe chmod 0755 './bash' maybe chmod 0644 './bash/bash_logout' @@ -96,6 +104,7 @@ maybe chmod 0644 './dbus-1/session.d/.keep_sys-apps_dbus-0' maybe chmod 0644 './dbus-1/system.conf' maybe chmod 0755 './dbus-1/system.d' maybe chmod 0644 './dbus-1/system.d/.keep_sys-apps_dbus-0' +maybe chmod 0644 './dbus-1/system.d/ConsoleKit.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.PolicyKit1.conf' maybe chmod 0755 './default' maybe chmod 0600 './default/useradd' @@ -240,6 +249,7 @@ maybe chmod 0755 './init.d' maybe chmod 0755 './init.d/aiccu' maybe chmod 0755 './init.d/bootmisc' maybe chmod 0755 './init.d/consolefont' +maybe chmod 0755 './init.d/consolekit' maybe chmod 0755 './init.d/crypto-loop' maybe chmod 0755 './init.d/dbus' maybe chmod 0755 './init.d/devfs' diff --git a/ConsoleKit/run-session.d/.keep_sys-auth_consolekit-0 b/ConsoleKit/run-session.d/.keep_sys-auth_consolekit-0 new file mode 100644 index 00000000..e69de29b diff --git a/ConsoleKit/seats.d/00-primary.seat b/ConsoleKit/seats.d/00-primary.seat new file mode 100644 index 00000000..6e61db40 --- /dev/null +++ b/ConsoleKit/seats.d/00-primary.seat @@ -0,0 +1,5 @@ +[Seat Entry] +Version=1.0 +Name=Primary seat +Hidden=false +Devices= \ No newline at end of file diff --git a/X11/xinit/xinitrc.d/90-consolekit b/X11/xinit/xinitrc.d/90-consolekit new file mode 100755 index 00000000..358fc24f --- /dev/null +++ b/X11/xinit/xinitrc.d/90-consolekit @@ -0,0 +1,32 @@ +# -*- sh -*- +# Xsession.d script for ck-launch-session. +# +# +# This file is sourced by Xsession(5), not executed. + +CK_LAUNCH_SESSION=/usr/bin/ck-launch-session + +is_on_console() { + session=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \ + --type=method_call --print-reply --reply-timeout=2000 \ + /org/freedesktop/ConsoleKit/Manager \ + org.freedesktop.ConsoleKit.Manager.GetCurrentSession \ + | grep path | awk '{print $3}' | sed s/\"//g) + x11_display=$(dbus-send --system --dest=org.freedesktop.ConsoleKit \ + --type=method_call --print-reply --reply-timeout=2000 \ + $session org.freedesktop.ConsoleKit.Session.GetX11Display \ + | grep string | awk '{print $2}' | sed s/\"//g) + + if [ -z "$x11_display" ] ; then + return 0 + else + return 1 + fi +} + +# gdm already creates a CK session for us, so do not run the expensive D-Bus +# calls if we have $GDMSESSION +if [ -z "$GDMSESSION" ] && [ -x "$CK_LAUNCH_SESSION" ] && \ + ( [ -z "$XDG_SESSION_COOKIE" ] || is_on_console ) ; then + command="$CK_LAUNCH_SESSION $command" +fi diff --git a/dbus-1/system.d/ConsoleKit.conf b/dbus-1/system.d/ConsoleKit.conf new file mode 100644 index 00000000..948f95f0 --- /dev/null +++ b/dbus-1/system.d/ConsoleKit.conf @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/init.d/consolekit b/init.d/consolekit new file mode 100755 index 00000000..d469b463 --- /dev/null +++ b/init.d/consolekit @@ -0,0 +1,24 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/sys-auth/consolekit/files/consolekit-0.1.rc,v 1.2 2009/09/12 19:46:19 nirbheek Exp $ + +depend() { + need dbus + use logger +} + +start() { + ebegin "Starting ConsoleKit daemon" + + start-stop-daemon --start -q \ + --pidfile /var/run/ConsoleKit/pid \ + --exec /usr/sbin/console-kit-daemon -- + eend $? +} + +stop() { + ebegin "Stopping ConsoleKit daemon" + start-stop-daemon --stop -q --pidfile /var/run/ConsoleKit/pid + eend $? +} -- 2.39.5