X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=docs%2Fgrml-live.txt;h=aafd340ea18e6a98177f1fa4b95dc7c1e832fdcb;hp=0874fdd0cc3cee7553d6c762e43fb38aa858580c;hb=refs%2Ftags%2Fv0.9.39;hpb=574c42b5cbb9d1264b84bade255aed42547db8ec diff --git a/docs/grml-live.txt b/docs/grml-live.txt index 0874fdd..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. @@ -532,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] @@ -559,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 @@ -832,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.