diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2013-01-02 21:19:06 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2013-01-02 21:19:06 +0000 |
| commit | 7171bf6ff50dafcf68469b4db6b2e251adcc2dc4 (patch) | |
| tree | 3a81ad843223037fa46357cf7683bb642236c265 /app-laptop | |
| parent | Version bump (diff) | |
| download | gentoo-2-7171bf6ff50dafcf68469b4db6b2e251adcc2dc4.tar.gz gentoo-2-7171bf6ff50dafcf68469b4db6b2e251adcc2dc4.tar.bz2 gentoo-2-7171bf6ff50dafcf68469b4db6b2e251adcc2dc4.zip | |
Commit patch also
(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-laptop')
| -rw-r--r-- | app-laptop/laptop-mode-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.62-remove-hal.patch | 28 |
2 files changed, 33 insertions, 1 deletions
diff --git a/app-laptop/laptop-mode-tools/ChangeLog b/app-laptop/laptop-mode-tools/ChangeLog index a66b8f559604..3d3cec0d75af 100644 --- a/app-laptop/laptop-mode-tools/ChangeLog +++ b/app-laptop/laptop-mode-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-laptop/laptop-mode-tools # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.65 2013/01/02 21:18:14 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-laptop/laptop-mode-tools/ChangeLog,v 1.66 2013/01/02 21:19:06 pacho Exp $ + + 02 Jan 2013; Pacho Ramos <pacho@gentoo.org> + +files/laptop-mode-tools-1.62-remove-hal.patch: + Commit patch also *laptop-mode-tools-1.62 (02 Jan 2013) diff --git a/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.62-remove-hal.patch b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.62-remove-hal.patch new file mode 100644 index 000000000000..63a3dbe63603 --- /dev/null +++ b/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.62-remove-hal.patch @@ -0,0 +1,28 @@ +--- usr/sbin/laptop_mode.orig 2013-01-02 22:07:03.879859499 +0100 ++++ usr/sbin/laptop_mode 2013-01-02 22:08:31.740888273 +0100 +@@ -670,23 +670,14 @@ + fi + + if [ "$ENABLE_LAPTOP_MODE_WHEN_LID_CLOSED" -ne 0 -a "$ACTIVATE" -eq 0 ] ; then +- if [ -x "`which hal-find-by-property`" ] ; then +- HAL_LID_BUTTON=$(hal-find-by-property --key "button.type" --string "lid") +- fi +- if [ "$HAL_LID_BUTTON" != "" ] ; then +- HAL_LID_BUTTON_STATE=$(hal-get-property --udi $(hal-find-by-property --key "button.type" --string "lid") --key "button.state.value") +- if [ "$HAL_LID_BUTTON_STATE" = "true" ] ; then +- log "VERBOSE" "Setting action to \"start\" because the lid is closed (says HAL)." +- ACTIVATE=1 +- fi +- elif [ -f /proc/acpi/button/lid/*/state ] ; then ++ if [ -f /proc/acpi/button/lid/*/state ] ; then + if ( grep -q "closed" /proc/acpi/button/lid/*/state ) ; then + log "VERBOSE" 'Setting action to "start" because the lid is closed (says /proc/acpi/button/lid/*/state).' + ACTIVATE=1 + fi + else + log "MSG" "Warning: ENABLE_LAPTOP_MODE_WHEN_LID_CLOSED is set, but there is no file" +- log "MSG" "/proc/acpi/button/lid/.../state, and hal information is not available either!" ++ log "MSG" "/proc/acpi/button/lid/.../state" + fi + fi + |