packages: hdparm/hdparm.init, hdparm/hdparm.spec, hdparm/hdparm.sysconfig -...

[glen]

Author: glen                         Date: Wed Aug 10 08:04:44 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow using disk labels from /dev/disk/by-id

---- Files affected:
packages/hdparm:
   hdparm.init (1.19 -> 1.20) , hdparm.spec (1.129 -> 1.130) , hdparm.sysconfig (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/hdparm/hdparm.init
diff -u packages/hdparm/hdparm.init:1.19 packages/hdparm/hdparm.init:1.20
--- packages/hdparm/hdparm.init:1.19	Sun Jan 20 23:20:37 2008
+++ packages/hdparm/hdparm.init	Wed Aug 10 10:04:39 2011
@@ -15,12 +15,25 @@
 
 for var in $blockdevs; do
 	drive=${var#HDPARM_}
-	if [ -L "/proc/ide/${drive}" -o -d "/sys/block/${drive}" ]; then
+
+	# check if it is some ID
+	if [ -L /dev/disk/by-id/ata-$drive ]; then
+		dev=$(readlink -f /dev/disk/by-id/ata-$drive)
+	elif [ -L /dev/disk/by-id/scsi-$dev ]; then
+		dev=$(readlink -f /dev/disk/by-id/scsi-$drive)
+	else
+		dev=$drive
+	fi
+
+	# strip /dev
+	dev=${dev#/dev/}
+
+	if [ -L "/proc/ide/$dev" -o -d "/sys/block/$dev" ]; then
 		eval PARAMS=\$$var
-		if [ -n "${PARAMS}" ]; then
+		if [ -n "$PARAMS" ]; then
 			show "Setting parameters for drive %s (%s)" "$drive" "$PARAMS"
 			busy
-			/sbin/hdparm ${PARAMS} /dev/${drive}
+			/sbin/hdparm $PARAMS /dev/$dev
 			ok
 		fi
 	fi

================================================================
Index: packages/hdparm/hdparm.spec
diff -u packages/hdparm/hdparm.spec:1.129 packages/hdparm/hdparm.spec:1.130
--- packages/hdparm/hdparm.spec:1.129	Thu Jul 21 01:21:20 2011
+++ packages/hdparm/hdparm.spec	Wed Aug 10 10:04:39 2011
@@ -10,7 +10,7 @@
 Summary(uk.UTF-8):	Утиліта для показу/установки параметрів жорстких дисків
 Name:		hdparm
 Version:	9.37
-Release:	2
+Release:	3
 License:	BSD
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/hdparm/%{name}-%{version}.tar.gz
@@ -125,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.130  2011/08/10 08:04:39  glen
+- allow using disk labels from /dev/disk/by-id
+
 Revision 1.129  2011/07/20 23:21:20  glen
 - package wiper.sh (ssd wiper program, see http://www.anandtech.com/print/2738 for good article)
 

================================================================
Index: packages/hdparm/hdparm.sysconfig
diff -u packages/hdparm/hdparm.sysconfig:1.3 packages/hdparm/hdparm.sysconfig:1.4
--- packages/hdparm/hdparm.sysconfig:1.3	Sun Jan 28 12:49:19 2007
+++ packages/hdparm/hdparm.sysconfig	Wed Aug 10 10:04:39 2011
@@ -1,9 +1,13 @@
 # This file lets you set your hard drive parameters for better performance
 # See hdparm(8) for details.
 # Please use -q flag before any other or you will get garbage on screen
+# You can use here /dev node ("/dev/"-part stripped), also /dev/disks/by-id is accepted
 
 #HDPARM_hda=
 #HDPARM_hdb="-qm 16 -qa 16 -qu 1"
 #HDPARM_hdb=
 #HDPARM_hdc=
 #HDPARM_hdd=
+#
+# for /dev/disk/by-id/ata-HDS722525VLSA80_VN6JTECFF1SP0A:
+#HDPARM_HDS722525VLSA80_VN6JTECFF1SP0A="-qy"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hdparm/hdparm.init?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hdparm/hdparm.spec?r1=1.129&r2=1.130&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hdparm/hdparm.sysconfig?r1=1.3&r2=1.4&f=u