X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=docs%2Fgrml-live.txt;h=55736bbe703d925116c1818359960e0148292abc;hp=df23631d0ea261f2153806af91d0331e878e7c60;hb=3f821b3f1ea5d7d8359c3df425fbb0038c069427;hpb=59296d870d632c8dc1a39fc1ff13bdbe4fbc299f

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index df23631..55736bb 100644
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -203,9 +203,10 @@ Specify name of the release.
 
   -s **SUITE**::
 
-Specify the Debian suite you want to use for your live-system.  Defaults to
-"squeeze" (being current Debian/stable). Supported values are: etch, lenny,
-squeeze, sid. Debian "squeeze" requires a recent base.tgz
+Specify the Debian suite you want to use for your live-system. If unset defaults
+to "testing". Supported values are: stable, testing, unstable (or their
+corresponding release names like "wheezy"). Please be aware that recent Debian
+suites might require a recent base.tgz
 (${GRML_FAI_CONFIG}/config/basefiles/$CLASSNAME.tar.gz) or a recent version of
 debootstrap.
 
@@ -318,6 +319,10 @@ selected. The following classes are predefined:
 
 * DEBORPHAN: get rid of all packages listed in output of deborphan
 
+* FRESHCLAM: execute freshclam (if it's present) to update clamav definitions
+(increases resulting ISO size ~70MB). By default it's skipped to avoid bigger
+ISO size.
+
 * GRMLBASE: the main class responsible for getting a minimal subset of what's
 defining a Grml system. Important parts of the buildprocess are specified in
 this class as well, so unless you have a really good reason you should always
@@ -477,8 +482,8 @@ Current state of grml-live with squashfs-tools and kernel
 ---------------------------------------------------------
 
 Use squashfs-tools >=4.2-1 (available from Grml repositories as well as from
-Debian/testing and Debian/unstable) to build Grml (based) ISOs featuring kernel
-version 2.6.38-grml[64] or newer.
+Debian) to build Grml (based) ISOs featuring kernel version 2.6.38-grml[64] or
+newer.
 
 [[faq]]
 FAQ
@@ -492,8 +497,7 @@ The easiest way to get a running grml-live setup is to just use Grml.
 Of course using grml-live on a plain, original Debian installation is supported
 as well. So there we go.
 
-What we have: plain, original Debian squeeze (6.0) with debian-backports
-enabled. (This is important for squashfs-tools.)
+What we have: plain, original Debian wheezy (7.x).
 
 What we want: build a Grml ISO based on Debian/wheezy for the amd64 architecture
 using grml-live.
@@ -524,7 +528,6 @@ Instructions
   # mv AMD64.tar.gz /etc/grml/fai/config/basefiles/
 
   # install relevant tools
-  apt-get install -t squeeze-backports squashfs-tools
   apt-get --no-install-recommends install grml-live
 
   # adjust grml-live configuration for our needs:
@@ -538,19 +541,19 @@ Instructions
   # CHROOT_INSTALL="/etc/grml/fai/chroot_install"
   ## adjust if necessary (defaults to /grml/grml-live):
   ## OUTPUT="/srv/grml-live"
-  FAI_DEBOOTSTRAP="wheezy http://cdn.debian.net/debian/"
+  FAI_DEBOOTSTRAP="wheezy http://ftp.debian.org/debian/"
   # ARCH="amd64"
   CLASSES="GRMLBASE,GRML_FULL,AMD64"
   EOF
 
   # just optional(!) - upgrade FAI to latest available version:
-  cat >> /etc/apt/sources.list << EOF
-  # fai:
-    deb http://fai-project.org/download squeeze koeln
+  cat >> /etc/apt/sources.list.d/fai.list << EOF
+  deb     http://jenkins.grml.org/debian fai main
+  deb-src http://jenkins.grml.org/debian fai main
   EOF
 
   # get gpg key of FAI repos and install current FAI version:
-  gpg -a --recv-keys AB9B66FD; gpg -a --export AB9B66FD | apt-key add -
+  wget -O - http://jenkins.grml.org/debian/C525F56752D4A654.asc | sudo apt-key add -
   apt-get update
   apt-get install fai-client fai-server fai-doc
 
@@ -651,7 +654,7 @@ How do I create a base.tgz?
 First of all create the chroot using debootstrap:
 
   BASECHROOT='/tmp/basefile'
-  debootstrap squeeze "$BASECHROOT" http://cdn.debian.net/debian
+  debootstrap wheezy "$BASECHROOT" http://ftp.debian.org/debian
   tar -C "$BASECHROOT" --exclude='var/cache/apt/archives/*.deb' -zcf base.tar.gz ./
 
 [TIP]
@@ -684,7 +687,7 @@ FAI_DEBOOTSTRAP:
   [...]
   APT_PROXY="http://localhost:3142/"
   [...]
-  FAI_DEBOOTSTRAP="squeeze http://localhost:3142/cdn.debian.net/debian squeeze main contrib non-free"
+  FAI_DEBOOTSTRAP="wheezy http://localhost:3142/ftp.debian.org/debian wheezy main contrib non-free"
 
 Make sure apt-cacher-ng is running ('/etc/init.d/apt-cacher-ng restart').
 That's it.  All downloaded files will be cached in /var/cache/apt-cacher-ng then.
@@ -711,7 +714,7 @@ How do I create a base tar.gz (I386.tar.gz or AMD64.tar.gz)
 Execute the following commands (requires root):
 
   ARCH='amd64' # replace with i386 if necessary
-  SUITE='squeeze' # using the current stable release should always work
+  SUITE='wheezy' # using the current stable release should always work
   debootstrap --arch "$ARCH" --exclude=info,tasksel,tasksel-data "$SUITE" "$ARCH" http://debian.netcologne.de/debian
   cd "$ARCH"
   rm var/cache/apt/archives/*.deb