saving uncommitted changes in /etc prior to emerge run

diff --git a/dbus-1/system.d/ConsoleKit.conf b/dbus-1/system.d/ConsoleKit.conf
index 45b09173b17f1a0e72220446a8b50e0fd6b63f0b..9c564cef89be32aaa1ef19a839a1e11319ab1ad0 100644 (file)
--- a/dbus-1/system.d/ConsoleKit.conf
+++ b/dbus-1/system.d/ConsoleKit.conf
@@ -15,11 +15,11 @@
   <policy context="default">
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.DBus.Introspectable"/>
-    <deny send_destination="org.freedesktop.ConsoleKit" 
+    <deny send_destination="org.freedesktop.ConsoleKit"
           send_interface="org.freedesktop.ConsoleKit.Manager"/>
-    <deny send_destination="org.freedesktop.ConsoleKit" 
+    <deny send_destination="org.freedesktop.ConsoleKit"
           send_interface="org.freedesktop.ConsoleKit.Seat"/>
-    <deny send_destination="org.freedesktop.ConsoleKit" 
+    <deny send_destination="org.freedesktop.ConsoleKit"
           send_interface="org.freedesktop.ConsoleKit.Session"/>
     <allow send_destination="org.freedesktop.ConsoleKit"
           send_interface="org.freedesktop.DBus.Properties" />
@@ -90,6 +90,9 @@
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSessionForUnixProcess"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="GetSessionByPID"/>
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetCurrentSession"/>
@@ -99,6 +102,12 @@
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSessionsForUser"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="ActivateSession"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="ActivateSessionOnSeat"/>
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="GetSystemIdleHint"/>
@@ -109,6 +118,9 @@
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Seat"
            send_member="GetId"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Seat"
+           send_member="GetName"/>
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Seat"
            send_member="GetSessions"/>
@@ -124,6 +136,9 @@
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Seat"
            send_member="ActivateSession"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Seat"
+           send_member="SwitchTo"/>
 
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Session"
@@ -137,6 +152,12 @@
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetSessionType"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="GetSessionClass"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="GetSessionState"/>
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetUser"/>
@@ -158,6 +179,9 @@
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="GetRemoteHostName"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="GetVTNr"/>
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="IsActive"/>
@@ -181,6 +205,23 @@
            send_member="GetIdleSinceHint"/>
     <allow send_interface="org.freedesktop.ConsoleKit.Session"
            send_member="SetIdleHint"/>
+    <allow send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="SetLockedHint"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="TakeControl"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="ReleaseControl"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="TakeDevice"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="ReleaseDevice"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Session"
+           send_member="PauseDeviceComplete"/>
   </policy>
 
 </busconfig>

diff --git a/init.d/consolekit b/init.d/consolekit
index 57ebfbe7843af9d10e44f3c1b20fc22f00d15de2..4fd1140fe20969c6cd5e97fe1ecb47a397ea6a69 100755 (executable)
--- a/init.d/consolekit
+++ b/init.d/consolekit
@@ -1,10 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
 
 description="consolekit - tracks login sessions and seats"
-pidfile="/var/run/ConsoleKit/pid"
+pidfile="/run/ConsoleKit/pid"
 command="/usr/sbin/console-kit-daemon"
 
 depend() {
@@ -13,5 +12,5 @@ depend() {
 }
 
 start_pre() {
-       checkpath -q -d -m 0755 /var/run/ConsoleKit
+       checkpath -q -d -m 0755 /run/ConsoleKit
 }