summaryrefslogtreecommitdiffstats
path: root/config/amnesia
diff options
context:
space:
mode:
authoramnesia <amnesia@boum.org>2010-10-15 10:03:46 +0200
committeramnesia <amnesia@boum.org>2010-10-15 10:03:46 +0200
commit0b3fcb4cdb2947049bfa18a772db983ea9e8bea8 (patch)
tree40c02bb4b568949dd44af1e7925c0b7446d569e4 /config/amnesia
parent37e6b5e50b5e6df8e51fb736391f2c83607d6f2f (diff)
parent8028c57b187f963fb2f242167197496d0396070a (diff)
Merge branch 'master' into squeeze
Conflicts: auto/config config/chroot_apt/preferences config/chroot_local-hooks/50-virtualbox
Diffstat (limited to 'config/amnesia')
-rw-r--r--config/amnesia6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/amnesia b/config/amnesia
index 3c93672..a5be0ff 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -10,8 +10,8 @@
# These configuration files are actually shell scripts, and are
# sourced by various other scripts.
-# Base for the string that will be passed to "lh config --bootappend-live"
-AMNESIA_APPEND="quiet splash vga=788 live-media=removable nopersistent noprompt=usb"
+# Base for the string that will be passed to "lb config --bootappend-live"
+AMNESIA_APPEND="splash vga=788 live-media=removable nopersistent noprompt=usb"
# Options passed to isohybrid
# Default: "-entry 4 -type 1c"
@@ -167,7 +167,7 @@ AMNESIA_FULL_VERSION="${AMNESIA_VERSION} - ${AMNESIA_TODAY} - Squeeze"
# Developpers' data used by git-dch, debcommit and friends in the release script
AMNESIA_DEV_FULLNAME="amnesia"
AMNESIA_DEV_EMAIL="amnesia@boum.org"
-AMNESIA_DEV_KEYID="F93E735F"
+AMNESIA_DEV_KEYID="BE2CD9C1"
# Supported languages (displayed in this order by the syslinux menu)
AMNESIA_SUPPORTED_LANGUAGES="ar zh de en fr it pt es"