[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [PATCH] hw-detect: Do not attempt to load ide-generic if paravirt is active.



On Mon, 2009-08-31 at 17:05 +0100, Ian Campbell wrote:
> 
> It's only legacy (non-PnP) ISA drivers of which AFAIK ide-generic is
> the only one d-i tries to load by default

This made me wonder why we even need to report failure to load
ide-generic to the user, after all if it loads but doesn't find any
hardware we don't report a failure in that case. Since there is no way
to probe for the h/w the driver is being loaded speculatively anyway.

With that in mind how about this patch?

--- 
Subject: hw-detect: do not report failure to load ide-generic to the user.

There is no way to probe for the need to load ide-generic but if it
fails then it must be unnecessary and there is no need to pop up an
error dialog to inform the user.

Only log the failure instead.
---
 packages/hw-detect/debian/changelog |    3 +++
 packages/hw-detect/hw-detect.sh     |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/packages/hw-detect/debian/changelog b/packages/hw-detect/debian/changelog
index a3eeb4c..5c6ac2a 100644
--- a/packages/hw-detect/debian/changelog
+++ b/packages/hw-detect/debian/changelog
@@ -22,6 +22,9 @@ hw-detect (1.74) UNRELEASED; urgency=low
   * Remove code to wait for initialization of megaraid_mbox driver. Should
     no longer be needed with current kernels.
 
+  [ Ian Campbell ]
+  * Do not present an error to the user is loading ide-generic fails.
+
  -- Gaudenz Steilin <gaudenz@debian.org>  Sat, 25 Jul 2009 13:02:53 +0200
 
 hw-detect (1.73) unstable; urgency=low
diff --git a/packages/hw-detect/hw-detect.sh b/packages/hw-detect/hw-detect.sh
index 43a39aa..a181019 100755
--- a/packages/hw-detect/hw-detect.sh
+++ b/packages/hw-detect/hw-detect.sh
@@ -108,7 +108,7 @@ load_module() {
 	else   
 		log "Error loading '$module'"
 		if [ "$module" != floppy ] && [ "$module" != ide-floppy ] && \
-		   [ "$module" != ide-cd ]; then
+		   [ "$module" != ide-cd ] && [ "$module" != ide-generic ]; then
 			db_subst hw-detect/modprobe_error CMD_LINE_PARAM "modprobe -v $module"
 			db_input medium hw-detect/modprobe_error || [ $? -eq 30 ]
 			db_go
-- 
1.6.3.3



-- 
Ian Campbell

 there is one bad thing about having a cell phone.
 I can be reached at any time. :|
 that's why I leave mine off at all times. ;>

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: