summaryrefslogtreecommitdiffstats
path: root/config/amnesia
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-02-11 13:32:43 +0100
committerTails developers <amnesia@boum.org>2015-02-11 16:40:15 +0100
commit972aa27b85109c2bda08d603edd42a451fe57d97 (patch)
tree144552ae85c371260f27f05591208bf5ec107878 /config/amnesia
parentf7d847c95e694c28744b7b4faba234a86c07fa8b (diff)
parent73aa9b2a4c07628f751205559b558496a9803ee5 (diff)
Merge remote-tracking branch 'origin/feature/hybrid-iso-strikes-back' into devel
Fix-committed: #8510 Conflicts: features/step_definitions/untrusted_partitions.rb
Diffstat (limited to 'config/amnesia')
-rw-r--r--config/amnesia6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/amnesia b/config/amnesia
index 0f03753..326f887 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -15,6 +15,12 @@
# 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 noautologin module=Tails"
+# Options passed to isohybrid
+AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63"
+
+# Minimal upstream version of syslinux-utils we need
+REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
+
### You should not have to change anything bellow this line ####################
# sanity checks