Add support for skipping hdparm init if kernel was booted with gentoo=nohdparm #156489 by Fabio Erculiani.

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 43 insertions, 24 deletions

diff --git a/sys-apps/hdparm/ChangeLog b/sys-apps/hdparm/ChangeLog
index b8e3dc997b49..9b39598813fa 100644
--- a/sys-apps/hdparm/ChangeLog
+++ b/sys-apps/hdparm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hdparm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.85 2006/11/15 13:06:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.86 2006/11/29 01:53:21 vapier Exp $
+
+  29 Nov 2006; Mike Frysinger <vapier@gentoo.org> files/hdparm-init-7:
+  Add support for skipping hdparm init if kernel was booted with
+  gentoo=nohdparm #156489 by Fabio Erculiani.
 
   15 Nov 2006; Markus Rothe <corsair@gentoo.org> hdparm-6.6.ebuild:
   Stable on ppc64; bug #153892
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 1d2b18b1590c..96dc579d80e4 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hdparm-conf.d.3 430 RMD160 2c075ab3bf51286999860e2fa08989327bbaa1e3 SHA1 994e932091e7a09136050b2b1a96c31850eee46d SHA256 e3d8ce9928385e25abd388cf2d169198e03129f41d3eca1f23c96fdbe54f3462
 MD5 7905eb90e421523aa0c7f32f3d16b1fe files/hdparm-conf.d.3 430
 RMD160 2c075ab3bf51286999860e2fa08989327bbaa1e3 files/hdparm-conf.d.3 430
 SHA256 e3d8ce9928385e25abd388cf2d169198e03129f41d3eca1f23c96fdbe54f3462 files/hdparm-conf.d.3 430
-AUX hdparm-init-7 3035 RMD160 02bb3fe798bf06a92b8efecdac05ca0e1a93f6b4 SHA1 1efa001950e03a0d9d7d41612a226b33012d7680 SHA256 3fac7413db0114514d5bd98daa929eed24050e24218620112ce78e2abca3759a
-MD5 76c34a2d50f3729f2dafda7015c5ee6c files/hdparm-init-7 3035
-RMD160 02bb3fe798bf06a92b8efecdac05ca0e1a93f6b4 files/hdparm-init-7 3035
-SHA256 3fac7413db0114514d5bd98daa929eed24050e24218620112ce78e2abca3759a files/hdparm-init-7 3035
+AUX hdparm-init-7 3149 RMD160 b864061c66738ed4e2ca63fc2e711f91621ffeed SHA1 49396efb8842331bcef85916b13d495ba2975850 SHA256 2bf92c7bb384e9d0a4b1ffed02bbd6833a0dc31e12d49747db8f776219876288
+MD5 0c1b37777883cfc08d53b8b51cb5fbd6 files/hdparm-init-7 3149
+RMD160 b864061c66738ed4e2ca63fc2e711f91621ffeed files/hdparm-init-7 3149
+SHA256 2bf92c7bb384e9d0a4b1ffed02bbd6833a0dc31e12d49747db8f776219876288 files/hdparm-init-7 3149
 DIST hdparm-6.3.tar.gz 44052 RMD160 dff66236938b7d3f60fe43505b4c0d8f4dce2386 SHA1 013ebdf957bbbd53889e910012f552343eeff4b6 SHA256 08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d
 DIST hdparm-6.6.tar.gz 45538 RMD160 714fbc5216bdb427c7e817649f3c4f5462620c13 SHA1 8d288e0c22d7ff5968f5fa507bbf56703b2f6ed9 SHA256 7e2db39a4e1f41bb327a9a8ef9e5e8359aaed0cc78e642a4ca67659629e3048b
 DIST hdparm-6.9.tar.gz 46801 RMD160 d862e656456f14fb8139c15cd68ba9252082532e SHA1 10e8dcdde0fe4ed482bbb1e4b19cb3ea07b2f58a SHA256 cae6ed86296d01be98ee3be0c224c4323eee508941a7f162a0366d56655afe06
@@ -21,10 +24,10 @@ EBUILD hdparm-6.9.ebuild 992 RMD160 c89dbbccb585013d6c61067790a9b5e5e0990640 SHA
 MD5 bdcb0a8d5b447206ae3c0697b38e009e hdparm-6.9.ebuild 992
 RMD160 c89dbbccb585013d6c61067790a9b5e5e0990640 hdparm-6.9.ebuild 992
 SHA256 4d42593ee80821cc8a11523cb9d46adab7bbc4e90b89f871d724ffad0b86f9b5 hdparm-6.9.ebuild 992
-MISC ChangeLog 10868 RMD160 ab90b14a051c61117e9e886c143c5cf9283476b6 SHA1 f475858cec53558456eb7c974c6b4eda888f0380 SHA256 887e066f50dfd17658aabfffc1c582901704daa10df32049e5727d4382eb34ef
-MD5 8fa221213afee858748e6347520b6018 ChangeLog 10868
-RMD160 ab90b14a051c61117e9e886c143c5cf9283476b6 ChangeLog 10868
-SHA256 887e066f50dfd17658aabfffc1c582901704daa10df32049e5727d4382eb34ef ChangeLog 10868
+MISC ChangeLog 11050 RMD160 f7710cf0dbb34e612db19391664c268d6ed8dc77 SHA1 bcf38b1ba9dc6c8aa42df5fa5ecc27c829718e4f SHA256 7dc3d3169692df5eafc161e0baecd924b2a04dc6db1e92a1b53040ecbd1a2e41
+MD5 b8c37fe7da44a44e617cfe25b2667a71 ChangeLog 11050
+RMD160 f7710cf0dbb34e612db19391664c268d6ed8dc77 ChangeLog 11050
+SHA256 7dc3d3169692df5eafc161e0baecd924b2a04dc6db1e92a1b53040ecbd1a2e41 ChangeLog 11050
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -38,3 +41,10 @@ SHA256 ffaad577c213d99ad547fddf0d22ad6e096114ff29fbca4d39216acc73ac0e46 files/di
 MD5 7ac1e2fe2d42973d1a3a5e8a69140dd9 files/digest-hdparm-6.9 229
 RMD160 f60e3443962c6b7a0148ee6cf560591a3fa41349 files/digest-hdparm-6.9 229
 SHA256 bd0d1bf3333855e47bea3a6edda1e54725e5557a22099a92992966431570a097 files/digest-hdparm-6.9 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFbOhwamhnQswr0vIRAoFWAKC6gsqgan27U/sy1juCk6chBYsbTQCeOOk2
+Gm9jUQXQ4Ncts/cJ4eWCFCM=
+=aan5
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hdparm/files/hdparm-init-7 b/sys-apps/hdparm/files/hdparm-init-7
index 72c16ed86532..22abcdc83d0a 100644
--- a/sys-apps/hdparm/files/hdparm-init-7
+++ b/sys-apps/hdparm/files/hdparm-init-7
@@ -134,6 +134,11 @@ scan_nondevfs() {
 }
 
 start() {
+	if get_bootparam "nohdparm" ; then
+		ewarn "Skipping hdparm init as requested in kernel cmdline"
+		return 0
+	fi
+
 	if [[ -e /dev/.devfsd ]] && [[ -d /dev/ide ]] ; then
 		scan_devfs
 	else
diff --git a/sys-apps/setarch/Manifest b/sys-apps/setarch/Manifest
index 201395e36214..2cc66938e1bc 100644
--- a/sys-apps/setarch/Manifest
+++ b/sys-apps/setarch/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX Makefile 599 RMD160 89e826aaa746b47a814a5d733df0e217d91b1e6c SHA1 f40ad6319722ea1baf5b196d8bb1a43942c782af SHA256 9fc1ac5cb3d1698dbd45785790d5a6e035ace87d4c9f3901f4e8efa7963afcdf
-MD5 d74a1952f66df60fc21aeb7f8611c88c files/Makefile 599
-RMD160 89e826aaa746b47a814a5d733df0e217d91b1e6c files/Makefile 599
-SHA256 9fc1ac5cb3d1698dbd45785790d5a6e035ace87d4c9f3901f4e8efa7963afcdf files/Makefile 599
+AUX Makefile 605 RMD160 ac3c2e097c7e305aa1bdae29dd7ae2ce0073ed3a SHA1 1e5d3377a31a77d8e36ff9b649121402210c3803 SHA256 acffb086ec2f8aaada95c9303f94cd5edb3bef26ce6fc9bfb0d8f5b88bf342f1
+MD5 e4f85b010dfebe2b339a18c4a4541f01 files/Makefile 605
+RMD160 ac3c2e097c7e305aa1bdae29dd7ae2ce0073ed3a files/Makefile 605
+SHA256 acffb086ec2f8aaada95c9303f94cd5edb3bef26ce6fc9bfb0d8f5b88bf342f1 files/Makefile 605
 AUX setarch-1.8-better-error.patch 276 RMD160 c92a492bcad7d696e5c24573bda764566e693ceb SHA1 768b688ec73a0ec2a47024177ae55a724eac9e5f SHA256 4dcff863026a24a9a42dffeacac33d10c7439871f73a15eaf23c31715a43aa1c
 MD5 7c2708cff7c403d23ea5d5dcf47967e1 files/setarch-1.8-better-error.patch 276
 RMD160 c92a492bcad7d696e5c24573bda764566e693ceb files/setarch-1.8-better-error.patch 276
@@ -48,14 +48,14 @@ EBUILD setarch-1.9.ebuild 865 RMD160 c9381e1e1f5e3c3dbc7607d69322122a5b19859c SH
 MD5 d0b32b76669d9d25ba78f9cdadc0c174 setarch-1.9.ebuild 865
 RMD160 c9381e1e1f5e3c3dbc7607d69322122a5b19859c setarch-1.9.ebuild 865
 SHA256 683c89ab0d6bdce3fdba47f1cb5c0261f00f13fb9359c33d11d6097a247a863b setarch-1.9.ebuild 865
-EBUILD setarch-2.0.ebuild 811 RMD160 fa1438c146d47cea26ab21d18bfdce21493f2838 SHA1 0e0a74a5472387971134b0cc93655a993f9dd929 SHA256 5d3c1f0f9342cbbddd80619f5d811cc8f342fb4c2a3f12bb44ca8f16faa0593d
-MD5 2439b2781f946794fe95c2f81e9c1f8d setarch-2.0.ebuild 811
-RMD160 fa1438c146d47cea26ab21d18bfdce21493f2838 setarch-2.0.ebuild 811
-SHA256 5d3c1f0f9342cbbddd80619f5d811cc8f342fb4c2a3f12bb44ca8f16faa0593d setarch-2.0.ebuild 811
-MISC ChangeLog 713 RMD160 afb82159372ca3a6992bd83483c0ba32c9f7bd23 SHA1 3183b4ed0a84a63e07e70868ca48d34921d2a58c SHA256 a7569a6701e288eb031a3779efdc169ee6e5dc9d5186ba54de9575a42e984f1a
-MD5 34219f18c95f57c70e54a9e1b0db347f ChangeLog 713
-RMD160 afb82159372ca3a6992bd83483c0ba32c9f7bd23 ChangeLog 713
-SHA256 a7569a6701e288eb031a3779efdc169ee6e5dc9d5186ba54de9575a42e984f1a ChangeLog 713
+EBUILD setarch-2.0.ebuild 812 RMD160 cafd44ee848df1192eb0e1a232ae982f5effb386 SHA1 f5ff91e9f685ddadabce96e30a192d4f68238385 SHA256 43919382f249b25df202287995ee462a1c7c9180cee46464184d0c367d40974c
+MD5 7748ec3798b75ec982badf0651d57db7 setarch-2.0.ebuild 812
+RMD160 cafd44ee848df1192eb0e1a232ae982f5effb386 setarch-2.0.ebuild 812
+SHA256 43919382f249b25df202287995ee462a1c7c9180cee46464184d0c367d40974c setarch-2.0.ebuild 812
+MISC ChangeLog 833 RMD160 f523b14f8e11f9df47f0268f1876bd7804351b70 SHA1 cc3c7965d1a32410b45503aed97eded7c37d1bca SHA256 eb1a22886ab24cb2ef2e8125b85462b53c2184e59b91f439c57abe5513b7a53c
+MD5 71409bf56590aefceda3e0193635e84c ChangeLog 833
+RMD160 f523b14f8e11f9df47f0268f1876bd7804351b70 ChangeLog 833
+SHA256 eb1a22886ab24cb2ef2e8125b85462b53c2184e59b91f439c57abe5513b7a53c ChangeLog 833
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -72,7 +72,7 @@ SHA256 713d103db377be2cb4e795dbdae59d7fdfd1f067fa7fb6aae0d80c08f66cece1 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFai6WamhnQswr0vIRAm7zAKCYY6VyVXq7MMWGErsLHozGkj9LZwCghWmx
-HX+rf6cSSpKkU1S7M6J0fG8=
-=+tpx
+iD8DBQFFbOlKamhnQswr0vIRAlWLAKCNk3SVSm1fFyqiKGwoLfGUHwWPUwCgnv1z
+s8aQtGUlgGTlZTk86SQ1uvo=
+=zQlh
 -----END PGP SIGNATURE-----