From: frank Date: Mon, 16 Jan 2012 19:45:41 +0000 (+0100) Subject: committing changes in /etc after emerge run X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=c2f9f4a93ff3aed4698a935a9baa8836a72b78fc;p=config%2Fbruni%2Fetc.git committing changes in /etc after emerge run Package changes: +sys-power/upower-0.9.13-r1 --- diff --git a/.etckeeper b/.etckeeper index e22e967e..337b01ee 100755 --- a/.etckeeper +++ b/.etckeeper @@ -63,6 +63,8 @@ maybe chmod 0644 './NetworkManager/dispatcher.d/.keep_net-misc_networkmanager-0' maybe chmod 0644 './NetworkManager/nm-system-settings.conf' maybe chmod 0755 './NetworkManager/system-connections' maybe chmod 0644 './NetworkManager/system-connections/.keep_net-misc_networkmanager-0' +maybe chmod 0755 './UPower' +maybe chmod 0644 './UPower/UPower.conf' maybe chmod 0755 './X11' maybe chmod 0755 './X11/app-defaults' maybe chmod 0644 './X11/app-defaults/XDvi' @@ -340,6 +342,7 @@ maybe chmod 0644 './dbus-1/system.d/nm-dispatcher.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.ModemManager.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.PolicyKit1.conf' maybe chmod 0644 './dbus-1/system.d/org.freedesktop.UDisks.conf' +maybe chmod 0644 './dbus-1/system.d/org.freedesktop.UPower.conf' maybe chmod 0644 './dbus-1/system.d/org.gnome.GConf.Defaults.conf' maybe chmod 0644 './dbus-1/system.d/pulseaudio-system.conf' maybe chmod 0644 './dbus-1/system.d/wpa_supplicant.conf' diff --git a/UPower/UPower.conf b/UPower/UPower.conf new file mode 100644 index 00000000..c9da9cdf --- /dev/null +++ b/UPower/UPower.conf @@ -0,0 +1,54 @@ +# Only the system vendor should modify this file, ordinary users +# should not have to change anything. + +[UPower] + +# This is the smallest amount of time that UPower gives to session and system +# processes after the suspend or hibernate request is given. +# If the session power management component uses AboutToSuspend() then the +# session process can only make this time larger than the value below, never +# smaller. +# +# Reducing this time means the suspend happens quicker, but might also not give +# some processes enough time to save state. +# +# default=1000 +SleepTimeout=1000 + +# This controls whether hibernate is allowed when using encrypted swap. +# +# default=true +AllowHibernateEncryptedSwap=true + +# Enable the Watts Up Pro device. +# +# The Watts Up Pro contains a generic FTDI USB device without a specific +# vendor and product ID. When we probe for WUP devices, we can cause +# the user to get a perplexing "Device or resource busy" error when +# attempting to use their non-WUP device. +# +# The generic FTDI device is known to also be used on: +# +# - Sparkfun FT232 breakout board +# - Parallax Propeller +# +# default=true +EnableWattsUpPro=true + +# Poll the kernel for dock state changes. +# +# Some drivers are still broken, and do not send out uvents when the +# connected state changes. +# +# default=false +PollDockDevices=false + +# Do we ignore the lid state +# +# Some laptops are broken. The lid state is either inverted, or stuck +# on or off. We can't do much to fix these problems, but this is a way +# for users to make the laptop panel vanish and for programs like +# gnome-power-manager to not suspend on system startup. +# +# default=false +IgnoreLid=false diff --git a/dbus-1/system.d/org.freedesktop.UPower.conf b/dbus-1/system.d/org.freedesktop.UPower.conf new file mode 100644 index 00000000..a15ce938 --- /dev/null +++ b/dbus-1/system.d/org.freedesktop.UPower.conf @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + +