[gentoo-commits] gentoo-x86 commit in app-laptop/laptop-mode-tools/files: laptop-mode-tools-1.63-udevadm.patch

[Alon Bar-Lev (alonbl)]

alonbl      13/08/30 18:47:39

  Added:                laptop-mode-tools-1.63-udevadm.patch
  Log:
  Backport udevadm search, bug#477958
  
  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

Revision  Changes    Path
1.1                  app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-laptop/laptop-mode-tools/files/laptop-mode-tools-1.63-udevadm.patch?rev=1.1&content-type=text/plain

Index: laptop-mode-tools-1.63-udevadm.patch
===================================================================
From f52ccd0c2de1c2d22d8f351579cf2d89d8110933 Mon Sep 17 00:00:00 2001
From: Alexander Mezin <mezin.alexander@×××××.com>
Date: Wed, 24 Jul 2013 09:38:56 +0700
Subject: [PATCH] Replace hardcoded path to udevadm with "which udevadm"

---
 usr/share/laptop-mode-tools/modules/hdparm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/share/laptop-mode-tools/modules/hdparm b/usr/share/laptop-mode-tools/modules/hdparm
index 0115422..ac4f9c0 100755
--- a/usr/share/laptop-mode-tools/modules/hdparm
+++ b/usr/share/laptop-mode-tools/modules/hdparm
@@ -41,7 +41,7 @@ is_capable() {
 	# It assumes more or less recent udev (> 070)
 	if [ $HAVE_UDEVINFO -ne 0 ] ; then
 		log "VERBOSE" "Querying $1 media type using udevinfo: "
-		if [ -x /sbin/udevadm ]; then
+		if [ -x "$(which udevadm 2> /dev/null)" ]; then
 			eval "$(udevadm info -q env -n $1 | egrep '(ID_TYPE=|ID_BUS=)' )"
 		else
 			eval "$(udevinfo -q env -n $1 | egrep '(ID_TYPE=|ID_BUS=)' )"
-- 
1.8.1.6