[SCM] live-initramfs branch, master, updated. debian/1.177.1-1-5-g8c6d3c5

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 8c6d3c54e353fe470d5a728b59f3ad716ac7ccb1
Author: Michael Prokop <mika at grml.org>
Date:   Fri Apr 2 16:35:40 2010 +0200

    Do not leak modprobe options to avoid booting errors with kernel options like libata.dma=0.

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 6777f99..d82efa5 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -187,7 +187,11 @@ setup_loop ()
 	local encryption=${5}
 	local readonly=${6}
 
-	modprobe -q -b "${module}"
+	# the output of setup_loop is evaluated in other functions,
+	# modprobe leaks kernel options like "libata.dma=0"
+	# as "options libata dma=0" on stdout, causing serious
+	# problems therefor, so instead always avoid output to stdout
+	modprobe -q -b "${module}" 1>/dev/null
 
 	udevadm settle
 

-- 
live-initramfs