summaryrefslogtreecommitdiffstats
path: root/config/amnesia
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2011-10-23 20:20:53 +0200
committerTails developers <amnesia@boum.org>2011-10-23 20:20:53 +0200
commit881e67edd4115d410134a46aa661a986787e34eb (patch)
tree7bea94dcca9d1a090a7d55610d0a8b0fc76d62e0 /config/amnesia
parent901d549a7060367b6b55a482f891fc453bd2c829 (diff)
parent9970975536fea62794bef91c824afa1aee4cb8f9 (diff)
Merge branch 'devel' into feature/tails-greeter
Conflicts: config/amnesia wiki/src/contribute/release_process/test.mdwn
Diffstat (limited to 'config/amnesia')
-rw-r--r--config/amnesia4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/amnesia b/config/amnesia
index 25c7a5d..2485d33 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -11,7 +11,9 @@
# sourced by various other scripts.
# Base for the string that will be passed to "lb config --bootappend-live"
-AMNESIA_APPEND="noswap live-media=removable nopersistent noprompt quiet timezone=Etc/UTC noautologin"
+# FIXME: see [[bugs/sdmem_on_eject_broken_for_CD]] for explanation why we
+# need to set block.events_dfl_poll_msecs
+AMNESIA_APPEND="noswap live-media=removable nopersistent noprompt quiet timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin"
# Options passed to isohybrid
# Default: "-entry 4 -type 1c"