From 9ee25845831abe899c8a51148f15107d01d08235 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Fri, 19 Jul 2013 14:38:28 -0400
Subject: [PATCH] rcS, primary_fb: Redirect modprobe output to /dev/null

There is no need for it - especially if it fails.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 root_image/etc/init.d/primary_fb | 20 ++++++++++----------
 root_image/etc/init.d/rcS        | 18 +++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/root_image/etc/init.d/primary_fb b/root_image/etc/init.d/primary_fb
index 7d4fe0a..4336ad8 100755
--- a/root_image/etc/init.d/primary_fb
+++ b/root_image/etc/init.d/primary_fb
@@ -10,24 +10,24 @@ fb_start ()
 
 	/usr/bin/fb_test
 
-	modprobe i2c-core
-	modprobe i2c-algo-bit
-	modprobe drm debug=255
-	modprobe agpgart-intel
+	modprobe i2c-core >/dev/null 2>&1
+	modprobe i2c-algo-bit >/dev/null 2>&1
+	modprobe drm debug=255 >/dev/null 2>&1
+	modprobe agpgart-intel >/dev/null 2>&1
 
-	modprobe radeon modeset=1
-	modprobe nouveau modeset=1
-	modprobe i915 modeset=1
+	modprobe radeon  >/dev/null 2>&1
+	modprobe nouveau  >/dev/null 2>&1
+	modprobe i915  >/dev/null 2>&1
 
 	/lib/udev/console_init tty0
 
 	/usr/bin/fb_test
-	
+
 	BDF=0000:`lspci -mm | grep VGA | awk '{ print $1 }'`
 	echo VGA: $BDF
 
 	if [ ! -d /dev/dri ]; then
-		rm -f /usr/lib*/plymouth/renderers/drm.so
+		rm -f /usr/lib*/plymouth/renderers/drm.so >/dev/null 2>&1
 	fi
 	plymouth --show-splash
 	plymouth message --text=Yo
@@ -50,5 +50,5 @@ if [ $? == 1 ]; then
 		*)
 			fb_start
 			;;
-	esac	
+	esac
 fi
diff --git a/root_image/etc/init.d/rcS b/root_image/etc/init.d/rcS
index 463a833..9ba8765 100755
--- a/root_image/etc/init.d/rcS
+++ b/root_image/etc/init.d/rcS
@@ -54,8 +54,8 @@ fi
 
 NODMADUMP=$(boot_parameter 'nodmadump')
 if [ $? == 1 ]; then
-	modprobe dump_dma
-	rmmod dump_dma
+	modprobe dump_dma >/dev/null 2>&1
+	rmmod dump_dma >/dev/null 2>&1
 fi
 
 if [ `uname -m` == "x86_64" ]; then
@@ -65,17 +65,17 @@ fi
 /etc/init.d/primary_fb stop
 
 # Start iSCSI initiator
-modprobe crc32c
-modprobe libcrc32c
-modprobe iscsi_tcp
-modprobe scsi_transport_iscsi
+modprobe crc32c >/dev/null 2>&1
+modprobe libcrc32c >/dev/null 2>&1
+modprobe iscsi_tcp >/dev/null 2>&1
+modprobe scsi_transport_iscsi >/dev/null 2>&1
 
 NOIBFT=$(boot_parameter 'noibft')
 if [ $? == 1 ]; then
 	IQN="iqn.1994-05.com.dumpdata:"`hostname -i | md5sum | awk '{print $1}'`
 	echo "InitiatorName=$IQN" > /etc/iscsi/initiatorname.iscsi
 	iscsid &
-	modprobe iscsi_boot_sysfs
+	modprobe iscsi_boot_sysfs >/dev/null 2>&1
 	/sbin/iscsistart -f
 fi
 
@@ -94,8 +94,8 @@ if [ -e /sys/hypervisor/type ]; then
 fi
 
 if [ $XEND_LOAD -eq 1 ]; then
-	modprobe evtchn
-	modprobe xen_evtchn
+	modprobe evtchn >/dev/null 2>&1
+	modprobe xen_evtchn >/dev/null 2>&1
 	# Xen 4.0 can't deal with xencommons running first
 	XEN_VERSION=`xen-detect | sed -e 's/.*v//' -e 's/\.//g'`
 	if [ "$XEN_VERSION" != 40 ]; then
-- 
2.39.5