summaryrefslogtreecommitdiffstats
path: root/config/amnesia
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-03-18 08:39:47 +0000
committerintrigeri <intrigeri@boum.org>2015-03-18 08:39:47 +0000
commita1402af16ab8c78b92dff6e95291532636658654 (patch)
treead4df8026dde5bb015c7873ccc4efbc837c97f4b /config/amnesia
parentc1706a2386be1a81fcd5d2fdf04a8b7870687340 (diff)
parent33ea5b0f8d37134942218f06fbae31aa710f9b88 (diff)
Merge remote-tracking branch 'origin/master' into feature/8740-new-signing-key-phase-2
Conflicts: wiki/src/contribute/release_process/test.mdwn
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 da489a1..5f2c0a3 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