summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Prokop <mika@grml.org>2010-04-02 16:35:40 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:48:08 +0100
commitb81de07d942f74afdefd6f60c9cf4e0a09109c50 (patch)
tree219e8fb38d64d0b44e504a5e08c43de24dba5bcf
parentbecd19e1a5b4774fb35c8acf9055e1470e965c18 (diff)
downloadlive-boot-b81de07d942f74afdefd6f60c9cf4e0a09109c50.tar.gz
live-boot-b81de07d942f74afdefd6f60c9cf4e0a09109c50.zip
Do not leak modprobe options to avoid booting errors with kernel options like libata.dma=0.
-rw-r--r--scripts/live-helpers6
1 files changed, 5 insertions, 1 deletions
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