summaryrefslogtreecommitdiffstats
path: root/config/amnesia
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-02-26 13:41:40 +0000
committerTails developers <amnesia@boum.org>2014-02-26 13:42:05 +0000
commit8af7b2d7a9775e46a9c89ec299a23c433fb24e54 (patch)
tree3f069e5a17c9ae2b517428fd5c28cbd5fc70227c /config/amnesia
parenta317394620c44c067da9c80714dedf6c7e344f20 (diff)
parent6a42b86376bab56df71f1d4561841b6ef942dd6a (diff)
Merge remote-tracking branch 'origin/devel' into feature/wheezy
Conflicts: config/amnesia config/chroot_local-packageslists/tails-common.list refresh-translations
Diffstat (limited to 'config/amnesia')
-rw-r--r--config/amnesia2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/amnesia b/config/amnesia
index 89052d6..cc60398 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -13,7 +13,7 @@
# Base for the string that will be passed to "lb config --bootappend-live"
# FIXME: see [[bugs/sdmem_on_eject_broken_for_CD]] for explanation why we
# need to set block.events_dfl_poll_msecs
-AMNESIA_APPEND="live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash nox11autologin module=Tails"
+AMNESIA_APPEND="live-media=removable apparmor=1 security=apparmor nopersistent noprompt timezone=Etc/UTC block.events_dfl_poll_msecs=1000 splash noautologin module=Tails"
### You should not have to change anything bellow this line ####################