X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=docs%2Fgrml-live.txt;h=aafd340ea18e6a98177f1fa4b95dc7c1e832fdcb;hp=6d586603ea4b370c796c3a337305825cebc943a0;hb=d9141d9b861662e4b514706a2961130860090c6f;hpb=a5f8527557ae9bdceb1227de4e023fa6a353234a diff --git a/docs/grml-live.txt b/docs/grml-live.txt index 6d58660..aafd340 100644 --- a/docs/grml-live.txt +++ b/docs/grml-live.txt @@ -347,7 +347,7 @@ configuration instead. /etc/grml/grml-live.local All the local configuration should go to this file. This file overrides any -defaults of grml-live. Configurations via /etc/grml/grml-live.local are prefered +defaults of grml-live. Configurations via /etc/grml/grml-live.local are preferred over the ones from /etc/grml/grml-live.conf. If you want to override settings from /etc/grml/grml-live.local as well you have to specify them on the grml-live commandline. @@ -379,7 +379,7 @@ like to see included). Important: this file should *not* be adjusted manually! Instead use the GRML_LIVE_SOURCES variable inside /etc/grml/grml-live.conf or /etc/grml/grml-live.local which modifies /etc/grml/fai/apt/sources.list on-the-fly via grml-live then. If you want to generally adjust apt configuration -check out /etc/grml/fai/files/etc/apt instead. +use FAI's fcopy command with /etc/grml/fai/config/files instead. /etc/grml/fai/config/ @@ -417,12 +417,6 @@ reasonable package configuration. Scripts for customising the ISO within the build process. - /etc/grml/fai/files/ - -This directory provides files used inside the scripts of -/etc/grml/fai/config/scripts/*. For a full documentation what happens with the -files please refer to the source of the scripts. - /etc/grml/fai/live-initramfs/ This directory provides the files used for building the initramfs/initrd via @@ -538,6 +532,7 @@ ZLIB compression. Just use the defaults for enabling LZMA or use grml-live's * Kernel 2.6.26-grml[64]: does not work * Kernel 2.6.28-grml[64]: does not work * Kernel 2.6.31-grml[64]: works +* Kernel 2.6.33-grml[64]: works [NOTE] @@ -565,6 +560,7 @@ Grml's squashfs-lzma-tools (see section above) instead. * Kernel 2.6.26-grml[64]: does not work * Kernel 2.6.28-grml[64]: does not work * Kernel 2.6.31-grml[64]: works +* Kernel 2.6.33-grml[64]: works [NOTE] Please use squashfs-tools >=1:4.0-1 only if you want to remaster grml releases @@ -838,7 +834,7 @@ taken. If you customise the variables in /etc/grml/grml-live.conf then the two files will be adjusted during runtime automatically. If MIRROR_DIRECTORY and MIRROR_SOURCES are specified the local mirror will be -taken as first entry in the generated sources.list so it's prefered over +taken as first entry in the generated sources.list so it's preferred over non-local mirrors. Using a fallback mirror (via providing several mirrors in GRML_LIVE_SOURCES as used by default) is a recommended setting.