saving uncommitted changes in /etc prior to emerge run

diff --git a/acpi/actions/powerbtn.sh b/acpi/actions/powerbtn.sh
index 39a3d9b581fd44ba42afa395be98c80d20b91b2a..b6453e99d2175bf23eedb09e514268f029b6c05e 100755 (executable)
--- a/acpi/actions/powerbtn.sh
+++ b/acpi/actions/powerbtn.sh
@@ -51,13 +51,13 @@ test -f /var/lock/acpisleep && exit 0
 getXconsole
 
 # A list of power management system process names.
-PMS="gnome-power-manager kpowersave xfce4-power-manager"
+PMS="gnome-power-manager kpowersave xfce4-power-manager mate-power-manager"
 PMS="$PMS guidance-power-manager.py dalston-power-applet"
 
 # If one of those is running or any of several others,
 if pidof x $PMS > /dev/null ||
        ( test "$XUSER" != "" && pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop --user $XUSER kded kded loadedModules | grep -q klaptopdaemon) ||
-       ( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pidof kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pidof kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
+       ( test "$XUSER" != "" && test -x /usr/bin/qdbus && test -r /proc/$(pgrep -n kded4)/environ && su - $XUSER -c "eval $(echo -n 'export '; cat /proc/$(pgrep -n kded4)/environ |tr '\0' '\n'|grep DBUS_SESSION_BUS_ADDRESS); qdbus org.kde.kded" | grep -q powerdevil) ; then
        # Get out as the power manager that is running will take care of things.
     exit
 fi

diff --git a/init.d/acpid b/init.d/acpid
index 412a265fc56b1cb0837c52f731f7289ba5ecdc84..7f3ff3c72ab8b72cbffd0c943f233d220c3c7e8b 100755 (executable)
--- a/init.d/acpid
+++ b/init.d/acpid
@@ -1,12 +1,11 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.16-init.d,v 1.1 2012/05/19 09:53:59 ssuominen Exp $
+# $Id$
 
 extra_started_commands="reload"
 command="/usr/sbin/acpid"
 command_args="${ACPID_ARGS}"
-start_stop_daemon_args="--quiet"
 description="Daemon for Advanced Configuration and Power Interface"
 
 depend() {