projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grml-live: drop useless of of ls(1).
[grml-live-grml.git]
/
etc
/
grml
/
grml-live.conf
diff --git
a/etc/grml/grml-live.conf
b/etc/grml/grml-live.conf
index
5e648cb
..
6563eec
100644
(file)
--- a/
etc/grml/grml-live.conf
+++ b/
etc/grml/grml-live.conf
@@
-164,12
+164,18
@@
# *without* having to run grml2usb (like: 'dd if=grml.iso of=/dev/sdX')
# - working both with the same ISO
# HYBRID_METHOD='disable' # do not create a hybrid ISO
# *without* having to run grml2usb (like: 'dd if=grml.iso of=/dev/sdX')
# - working both with the same ISO
# HYBRID_METHOD='disable' # do not create a hybrid ISO
-# HYBRID_METHOD='isohybrid' # use isohybrid instead of the default (being manifold)
+# HYBRID_METHOD='isohybrid' # use isohybrid from SYSLINUX
+# HYBRID_METHOD='grub2' # use manifold with GRUB 2
+# HYBRID_METHOD='manifold' # use manifold with ISOLINUX (default)
# Binary that should be used for creating the squashfs file.
# Binary that should be used for creating the squashfs file.
-# Defaults to
mksquashfs-lzma if available or
falls back to mksquashfs.
+# Defaults to
the executable matching the kernel version,
falls back to mksquashfs.
# SQUASHFS_BINARY='mksquashfs'
# SQUASHFS_BINARY='mksquashfs'
+# Options that should be used by mksquashfs during build process.
+# Defaults to '-b 256k' and the according LZMA option.
+# SQUASHFS_OPTIONS='-b 256k'
+
# exclude files from compressed squashfs file using the
# the mksquashfs option -ef:
# SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes"
# exclude files from compressed squashfs file using the
# the mksquashfs option -ef:
# SQUASHFS_EXCLUDES_FILE="/etc/grml/fai/squashfs-excludes"
@@
-195,4
+201,7
@@
# Do you want to skip the /conf/bootid.txt feature?
# NO_BOOTID='1'
# Do you want to skip the /conf/bootid.txt feature?
# NO_BOOTID='1'
+# Do you want to add any additional bootoptions that should be used by default?
+# DEFAULT_BOOTOPTIONS="ssh=secret"
+
## END OF FILE #################################################################
## END OF FILE #################################################################