svn commit: r233572 - stable/9/usr.sbin/pc-sysinstall/backend-query

[Josh Paetzel]

Author: jpaetzel
Date: Tue Mar 27 18:59:58 2012
New Revision: 233572
URL: http://svn.freebsd.org/changeset/base/233572

Log:
  MFC: 233131
  
  Redirect camcontrol stderr to /dev/null.

Modified:
  stable/9/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
Directory Properties:
  stable/9/usr.sbin/pc-sysinstall/   (props changed)

Modified: stable/9/usr.sbin/pc-sysinstall/backend-query/disk-list.sh
==============================================================================
--- stable/9/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Tue Mar 27 18:27:45 2012	(r233571)
+++ stable/9/usr.sbin/pc-sysinstall/backend-query/disk-list.sh	Tue Mar 27 18:59:58 2012	(r233572)
@@ -86,7 +86,7 @@ do
   fi
 
   # Try and find some identification information with camcontrol or atacontrol
-  NEWLINE=$(camcontrol identify $DEV | sed -ne 's/^device model *//p')
+  NEWLINE=$(camcontrol identify $DEV 2>/dev/null | sed -ne 's/^device model *//p')
   if [ -z "$NEWLINE" ]; then
 	# Now try atacontrol
   	NEWLINE=$(atacontrol list 2>/dev/null | sed -n "s|^.*$DEV <\(.*\)>.*|\1|p")