summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/hdparm')
-rw-r--r--sys-apps/hdparm/ChangeLog6
-rw-r--r--sys-apps/hdparm/files/hdparm-init-75
2 files changed, 10 insertions, 1 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/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