Also run on cdrom devices, and drop devfsd support #413705 by tokiclover.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 27 insertions, 95 deletions

diff --git a/sys-apps/hdparm/ChangeLog b/sys-apps/hdparm/ChangeLog
index 57a557734670..6ce26d0d1841 100644
--- a/sys-apps/hdparm/ChangeLog
+++ b/sys-apps/hdparm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/hdparm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.229 2012/04/14 07:47:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.230 2012/04/29 00:30:18 vapier Exp $
+
+  29 Apr 2012; Mike Frysinger <vapier@gentoo.org> files/hdparm-init-8:
+  Also run on cdrom devices, and drop devfsd support #413705 by tokiclover.
 
   14 Apr 2012; Zac Medico <zmedico@gentoo.org> hdparm-9.39.ebuild:
   Add ~amd64-linux keyword.
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 647b0c1f90fd..190d03daa82f 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA1
 
 AUX hdparm-conf.d.3 872 RMD160 86e87227ea4ec1a1967632f95277b4c941ab8606 SHA1 4707c3e7668dd31dae048386eda92b0cbd818774 SHA256 37c95ff723fa578e9039613d09dbf790d99113a318c065422986c744519214e9
-AUX hdparm-init-8 3407 RMD160 20a1107fbcef692ac8d8cf3c6b4b48dbc66d11fd SHA1 1897f3d4c98720b7e49b0a9ecd8070157b93be1c SHA256 c82b309bae71bebb13956c0c17eeab9e408f7da2c5cbd0405878779301200eb5
+AUX hdparm-init-8 1469 RMD160 66ef462a9d4298c813208760437203a23edd3c0c SHA1 1f713f1603a78042aa23d38802da9478c06fd35c SHA256 434beee81ba04c96fcd03e6b37a4578c2c25af2c1007368469c48dd37523d56e
 DIST hdparm-9.28.tar.gz 114144 RMD160 5adfc32e4310d734816d05c0f8b5af9583775ebf SHA1 b320997655788e5cb658e643d82ddc2e30e187d4 SHA256 693964d587be8726d930684defc7005735310f51a65614c05f1cabd6b7b55096
 DIST hdparm-9.36.tar.gz 121153 RMD160 9fa1ca95a4d794aea57fc65cd6f92a421186a73e SHA1 8bd52fdccd650c9dd1968af7320463f04a4ccf40 SHA256 88cdf28eae3af8d490f48427150c8ffb436cf2176f8bc5a0863d837eee4f6c43
 DIST hdparm-9.37.tar.gz 122062 RMD160 76b46f39c2ec219d8d4e5f75a6bced18ad7eca1c SHA1 8680bb7dd9df1c9cc96ab5e0eb6a821a95ccc76a SHA256 87ede0a7cb5b4de500748232e9d251b75acfccce078e1d42c8d125b9e5b4ccd3
@@ -13,12 +13,22 @@ EBUILD hdparm-9.36.ebuild 987 RMD160 d08e842cc66b32d4cc817e14648a5123675ba1bc SH
 EBUILD hdparm-9.37.ebuild 1010 RMD160 659f5c6a8e1e3a5b407f14996196df9976071db0 SHA1 844ac71b06c98119f85a22975293396820b219df SHA256 7fd81b100478fbcf87234eeee11dd9b4dd70eb8635dbfa7a4c3575f5e1ea36b7
 EBUILD hdparm-9.38.ebuild 1009 RMD160 40a4bb59e3488301a0a64e558bd72440e562da45 SHA1 aab1b91f45caaec3e406e096174f060016ddc49e SHA256 4ff252f4703d7934c15fc3e784f050fbf0cddea0bbdd1da7e4e962faaae607b3
 EBUILD hdparm-9.39.ebuild 971 RMD160 f1bf4a9c7a7838d8be0ccb0f3a2897a3debf9baf SHA1 6c7c3db68bc04124a1f3e4bbd0744d5560f5cf80 SHA256 ef121e5c141480413e192d33b45cb2d978a2685e8ffef44939887e47c36a4c6e
-MISC ChangeLog 26585 RMD160 4eff074838b865f726cdcd2f6db1a4cf5922a87b SHA1 c278fa5cc29adcc5e69d490c21682fc8368711b8 SHA256 63c61e82cea061a47f8d540a01dcbdf371557dbcd41be8259b5a8b77a04d0806
+MISC ChangeLog 26732 RMD160 a9d779f97bf537d260e23b492732c12587b32104 SHA1 ef049b2a75e86e20600af6d72ed4f6f0e10552d6 SHA256 28bb44cbf8eece4d0c42769ff924671686fec12b293e3c74cbf3994e9f650c94
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+JK6IACgkQ/ejvha5XGaM1TACglxRcs7P8xZKb6hj0KMXhBzyT
-aFwAniBErrlChjobyc26Pr6/F8EuxWB8
-=1y3D
+iQIcBAEBAgAGBQJPnIwkAAoJELEHsLL7fEFWl5AP/RnZFW0gqrXdEvup8VGVZ5ou
+ZEBi/zXoFQPxBrvJJmts+ax/VnD2rH7tI9JWjmBFncSHlD0nWqze6bqscuY6LqX0
+CCVIvWrfS+Rek5wZ+h4GehHphcUi3BRXFDWpYANTKoKhKsRuof8mk9TCtIXmJXjj
+bc+9oX07wVFdye24uPR/9cXJ03p6SxQG5jbruQ+yWgIgjJJ7zqy74+0npPwBxEjb
+thDjWVfWa/41VuH/b5/ZkZrHpltUVcI4FVy2J1fRlEFBoXGQMZIgQTXPgfhvtpXR
+SpDsAmwIYqZXHIsKFxIsT3WvBhlT6ZlefymXHJTlIaKxTVHqaVfPkPw66Sg/fOTq
+2Ak31sZFgKgpAaddFSvU8vqv0qJuIT/bcTcqfHeBwflO3QMR7xru/LRNRixOPYyF
+9uzS6diXQ8+a3vSfskerRv7KybrbrEq3Rq29hKLrSUvKhngQwKUiKGs5/OIm1395
+SBjldQh5iwRo/dzTtl4XBBdHfsxD/YFJJdLbQ7AkWZyQtxD8PlXLY7Gef2VgC6F5
+10LHtFzjgdc924ePeSaZCsDEOLkb4QLD4qZlBFC8EvVj35kaKwCp0yuS+hu0X80P
+Ed6d+ZM0FiCUzE6A4FIn3y6Q/cIEQSnkwIMnlQL0JU3cLfvuQEzrOx2znMnENfIt
+UuGpPa4YvdhpIm4aF2h5
+=wuSC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hdparm/files/hdparm-init-8 b/sys-apps/hdparm/files/hdparm-init-8
index 89aa4f82b7aa..9a4200c8277a 100644
--- a/sys-apps/hdparm/files/hdparm-init-8
+++ b/sys-apps/hdparm/files/hdparm-init-8
@@ -1,24 +1,7 @@
 #!/sbin/runscript
-# METHOD
-# ------
-# if /dev/ide exists, find all block devices beneath it named disc, cd, or
-# generic.
-#
-# for the disc and cd ones, if there is a a matching /dev/hdX symlink and
-# hdX_args is set in the config file, use hdX_args.  otherwise, if there is a
-# matching /dev/discs/discX or /dev/cdroms/cdromX symlink, and discX_args or
-# cdromX_args is set in the config file, use discX_args / cdromX_args.  finally,
-# if all_args is set in the config file, use that.
-#
-# for the generic ones, sort them and look for genericX_args in the config file
-# or use all_args.
-#
-# if /dev/ide does not exist, check the /dev/hdX entries, and see which ones
-# correspond to real devices by opening them for reading.  then check hdX_args
-# and all_args in the config file.
-#
-# for each device considered, if no args are found in the config file, do not
-# run hdparm.
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/files/hdparm-init-8,v 1.3 2012/04/29 00:30:18 vapier Exp $
 
 depend() {
 	before bootmisc
@@ -39,77 +22,17 @@ do_hdparm() {
 	fi
 }
 
-scan_devfs() {
-	local extra_args="pata_all_args" device= alias= args=
-
-	# devfs compatible systems
-	for device in $(find /dev/ide -name disc) ; do
-		args=''
-
-		for alias in /dev/hd? ; do
-			if [ "${alias}" -ef "${device}" ] ; then
-				device=${alias}
-				eval args=\$"$(basename "${alias}")"_args
-				break
-			fi
-		done
-
-		if [ -z "$args" ] ; then
-			for alias in /dev/discs/* ; do
-				if [ "${alias}"/disc -ef "${device}" ]; then
-					device="${alias}/disc"
-					eval args=\$"$(basename "${alias}")"_args
-					break
-				fi
-			done
-		fi
-
-		do_hdparm
-	done
-
-	for device in $(find /dev/ide -name cd) ; do
-		args=''
-
-		for alias in /dev/hd? ; do
-			if [ "${alias}" -ef "${device}" ] ; then
-				device=${alias}
-				eval args=\$"$(basename "${alias}")"_args
-				break
-			fi
-		done
-
-		if [ -z "$args" ] ; then
-			for alias in /dev/cdroms/* ; do
-				if [ "${alias}" -ef "${device}" ] ; then
-					device=${alias}
-					eval args=\$"$(basename "${alias}")"_args
-					break
-				fi
-			done
-		fi
-
-		do_hdparm
-	done
-
-	local count=0
-	# of course, the sort approach would fail here if any of the
-	# host/bus/target/lun numbers reached 2 digits..
-	for device in $(find /dev/ide -name generic | sort) ; do
-		eval args=\$generic${count}_args
-		do_hdparm
-		count=$((${count} + 1))
-	done
-}
-
 scan_nondevfs() {
 	# non-devfs compatible system
-	for device in /dev/hd* /dev/sd* ; do
+	local device
+
+	for device in /dev/hd* /dev/sd* /dev/cdrom* ; do
 		[ -e "${device}" ] || continue
 		case "${device}" in
 			*[0-9]) continue ;;
 			/dev/hd*)  extra_args="pata_all_args" ;;
 			/dev/sd*)  extra_args="sata_all_args" ;;
-			*)         extra_args="" ;;
+			*)         extra_args="_no_xtra_args" ;;
 		esac
 
 		# check that the block device really exists by
@@ -134,9 +57,5 @@ start() {
 		return 0
 	fi
 
-	if [ -e /dev/.devfsd -a -d /dev/ide ] ; then
-		scan_devfs
-	else
-		scan_nondevfs
-	fi
+	scan_nondevfs
 }