summaryrefslogtreecommitdiffstats
path: root/config/amnesia
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-03-26 16:01:13 +0200
committerTails developers <amnesia@boum.org>2012-03-26 16:01:13 +0200
commitec05569a3b59393d6315d06f9fb9a7f21260fe99 (patch)
tree5fddcfeaae4bdcf566a8eed3ed15b1d958bfb843 /config/amnesia
parent3876f94dcfa9e14cd2f395c021690cd9a76e3659 (diff)
parent21a0876caa543ff44ab9023b643ac54a0b7a5b42 (diff)
Merge branch 'feature/usb_installer' into devel
Conflicts: config/amnesia
Diffstat (limited to 'config/amnesia')
-rw-r--r--config/amnesia4
1 files changed, 0 insertions, 4 deletions
diff --git a/config/amnesia b/config/amnesia
index fbac456..96f4cd1 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -15,10 +15,6 @@
# 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 nox11autologin"
-# Options passed to isohybrid
-# Default: "-entry 4 -type 1c"
-AMNESIA_ISOHYBRID_OPTS="-entry 4 -type 1c"
-
### You should not have to change anything bellow this line ####################
# sanity checks