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 948f95f08f10b19b889e44309bef15f21cc88ebc..789da654eeabec5ff929cff0886fe0525b97a187 100644 (file)
--- a/dbus-1/system.d/ConsoleKit.conf
+++ b/dbus-1/system.d/ConsoleKit.conf
@@ -21,7 +21,7 @@
           send_interface="org.freedesktop.ConsoleKit.Seat"/>
     <deny send_destination="org.freedesktop.ConsoleKit" 
           send_interface="org.freedesktop.ConsoleKit.Session"/>
-    <deny send_destination="org.freedesktop.ConsoleKit"
+    <allow send_destination="org.freedesktop.ConsoleKit"
           send_interface="org.freedesktop.DBus.Properties" />
 
     <allow send_destination="org.freedesktop.ConsoleKit"
@@ -36,6 +36,42 @@
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="CanStop"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="Reboot"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="CanReboot"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="PowerOff"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="CanPowerOff"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="Suspend"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="CanSuspend"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="Hibernate"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="CanHibernate"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="HybridSleep"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="CanHybridSleep"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="Inhibit"/>
+    <allow send_destination="org.freedesktop.ConsoleKit"
+           send_interface="org.freedesktop.ConsoleKit.Manager"
+           send_member="ListInhibitors"/>
     <allow send_destination="org.freedesktop.ConsoleKit"
            send_interface="org.freedesktop.ConsoleKit.Manager"
            send_member="OpenSession"/>

diff --git a/init.d/consolekit b/init.d/consolekit
index b202267675256497a53a86e1ea3164dd3cfbad61..e84a2e0cebc1f96d7f2efb4b978e13b490ce4ced 100755 (executable)
--- a/init.d/consolekit
+++ b/init.d/consolekit
@@ -1,26 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 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.2.rc,v 1.1 2011/10/20 19:14:47 axs Exp $
+# $Id$
+
+description="consolekit - tracks login sessions and seats"
+pidfile="/var/run/ConsoleKit/pid"
+command="/usr/sbin/console-kit-daemon"
 
 depend() {
        need dbus
        use logger
 }
 
-start() {
-       ebegin "Starting ConsoleKit daemon"
-
+start_pre() {
        checkpath -q -d -m 0755 /var/run/ConsoleKit
-
-       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 $?
 }

diff --git a/logrotate.d/consolekit b/logrotate.d/consolekit
new file mode 100644 (file)
index 0000000..6e63e41
--- /dev/null
+++ b/logrotate.d/consolekit
@@ -0,0 +1,8 @@
+/var/log/ConsoleKit/history {
+       monthly
+       rotate 6
+       delaycompress
+       compress
+       notifempty
+       missingok
+}