use GRML_FULL as default and update docs accordingly for available classes

diff --git a/README.md b/README.md
index bfa2fe8..cb18433 100644 (file)
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Automatic Installation](http://fai-project.org/)).
 
 Building a Debian based 64bit live system is as simple as running:
 
 
 Building a Debian based 64bit live system is as simple as running:
 

-    # grml-live -s sid -a amd64 -c GRMLBASE,GRML_MEDIUM,AMD64
+    # grml-live -s sid -a amd64 -c GRMLBASE,GRML_FULL,AMD64

 
 You can fully customize the build process, including adding
 additional software and your very own configuration files.
 
 You can fully customize the build process, including adding
 additional software and your very own configuration files.

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index e2ebe2f..a525e6e 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -86,12 +86,12 @@ really know that you do not want to update the chroot.
   -c **CLASSES**::
 
 Specify the CLASSES to be used for building the ISO via FAI.  By default only
   -c **CLASSES**::
 
 Specify the CLASSES to be used for building the ISO via FAI.  By default only

-the classes GRMLBASE, GRML_MEDIUM and I386/AMD64 (depending on system
+the classes GRMLBASE, GRML_FULL and I386/AMD64 (depending on system

 architecture) are assumed, resulting in a small base system (being about ~180MB
 total ISO size). If using a non-I386 system (like AMD64) you should specify the
 appropriate architecture as well. Additionally you can specify a class providing
 a grml-kernel (see <<classes,the 'CLASSES' section in this document>> for
 architecture) are assumed, resulting in a small base system (being about ~180MB
 total ISO size). If using a non-I386 system (like AMD64) you should specify the
 appropriate architecture as well. Additionally you can specify a class providing
 a grml-kernel (see <<classes,the 'CLASSES' section in this document>> for

-details about available classes).  So instead of GRML_MEDIUM you can also use
+details about available classes).  So instead of GRML_FULL you can also use

 GRML_SMALL and GRML_FULL.
 
 [IMPORTANT]
 GRML_SMALL and GRML_FULL.
 
 [IMPORTANT]


@@ -246,7 +246,7 @@ To get a small Debian-unstable and grml-small based Live-CD using
 To get a medium sized, Debian-unstable and grml-based Live-CD for amd64
 architecture using /grml/grml-live as build and output directory just run:
 
 To get a medium sized, Debian-unstable and grml-based Live-CD for amd64
 architecture using /grml/grml-live as build and output directory just run:
 

-  # grml-live -s sid -a amd64 -c GRMLBASE,GRML_MEDIUM,AMD64
+  # grml-live -s sid -a amd64 -c GRMLBASE,GRML_FULL,AMD64

 
 To get a small, Debian-unstable and grml-based Live-CD using /tmp as build and
 output directory and use grml_0.0-3.iso as ISO name (placed inside
 
 To get a small, Debian-unstable and grml-based Live-CD using /tmp as build and
 output directory and use grml_0.0-3.iso as ISO name (placed inside


@@ -327,18 +327,21 @@ selected. The following classes are predefined:
 * DEBORPHAN: get rid of all packages listed in output of Deborphan
 
 * GRMLBASE: the main class responsible for getting a minimal subset of what's
 * DEBORPHAN: get rid of all packages listed in output of Deborphan
 
 * 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
+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
 use this class.
 
 this class as well, so unless you have a really good reason you should always
 use this class.
 

-* GRML_FULL: full featured grml, also known as the "normal", full grml.
+* GRML_FULL: full featured grml, also known as the "normal", full grml as
+introduced in november 2011 (~350MB ISO size).

 
 

-* GRML_MEDIUM: medium sized grml version, known as grml-medium
+* GRML_MEDIUM: medium sized grml version, used to be known as grml-medium
+until november 2011 (~220MB ISO size).

 
 

-* GRML_POWERPC: grml for PowerPC architecture, not supported yet (still work in
-progress)
+* GRML_SMALL: minimum sized grml version, known as grml-small (~110MB ISO
+size).

 
 

-* GRML_SMALL: minimum sized grml version, known as grml-small
+* GRML_XL: large size Grml version, used to be known as "full grml" until
+november 2011 (~700MB ISO size).

 
 * LATEX: LaTeX(-related) packages like auctex, texlive,...
 (which used to be shipped by grml before the LaTeX removal)
 
 * LATEX: LaTeX(-related) packages like auctex, texlive,...
 (which used to be shipped by grml before the LaTeX removal)


@@ -809,7 +812,7 @@ Instructions
   ## OUTPUT="/srv/grml-live"
   FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian/"
   ARCH="i386"
   ## OUTPUT="/srv/grml-live"
   FAI_DEBOOTSTRAP="squeeze http://cdn.debian.net/debian/"
   ARCH="i386"

-  CLASSES="GRMLBASE,GRML_MEDIUM,AMD64"
+  CLASSES="GRMLBASE,GRML_FULL,AMD64"

   # PRESERVE_LOGFILE='1'
   # ZERO_FAI_LOGFILE='1'
   GRML_LIVE_SOURCES="
   # PRESERVE_LOGFILE='1'
   # ZERO_FAI_LOGFILE='1'
   GRML_LIVE_SOURCES="

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index a1aa84a..a5d0e50 100644 (file)
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -57,7 +57,7 @@
 # are doing; make sure to also use a GRML_* class (for example GRML_SMALL,
 # GRML_MEDIUM or GRML_FULL) to get an according kernel and also select the
 # architecture (I386 for x86; AMD64 for x86_64)
 # are doing; make sure to also use a GRML_* class (for example GRML_SMALL,
 # GRML_MEDIUM or GRML_FULL) to get an according kernel and also select the
 # architecture (I386 for x86; AMD64 for x86_64)

-# CLASSES="GRMLBASE,GRML_MEDIUM,I386"
+# CLASSES="GRMLBASE,GRML_FULL,I386"

 
 # HTTP Proxy to use for APT
 # APT_PROXY="http://localhost:3142/"
 
 # HTTP Proxy to use for APT
 # APT_PROXY="http://localhost:3142/"

diff --git a/grml-live b/grml-live
index 8ec8348..d04f6f5 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -333,7 +333,7 @@ shift $(($OPTIND - 1))  # set ARGV to the first not parsed commandline parameter
 # assume sane defaults (if not set already) {{{
 [ -n "$ARCH" ]                    || ARCH="$(dpkg --print-architecture)"
 [ -n "$BOOT_METHOD" ]             || BOOT_METHOD='isolinux'
 # assume sane defaults (if not set already) {{{
 [ -n "$ARCH" ]                    || ARCH="$(dpkg --print-architecture)"
 [ -n "$BOOT_METHOD" ]             || BOOT_METHOD='isolinux'

-[ -n "$CLASSES" ]                 || CLASSES="GRMLBASE,GRML_MEDIUM,$(echo ${ARCH} | tr 'a-z' 'A-Z')"
+[ -n "$CLASSES" ]                 || CLASSES="GRMLBASE,GRML_FULL,$(echo ${ARCH} | tr 'a-z' 'A-Z')"

 [ -n "$DATE" ]                    || DATE="$(date +%Y-%m-%d)"
 [ -n "$DISTRI_INFO" ]             || DISTRI_INFO='Grml - Live Linux for system administrators   '
 [ -n "$DISTRI_NAME" ]             || DISTRI_NAME="grml"
 [ -n "$DATE" ]                    || DATE="$(date +%Y-%m-%d)"
 [ -n "$DISTRI_INFO" ]             || DISTRI_INFO='Grml - Live Linux for system administrators   '
 [ -n "$DISTRI_NAME" ]             || DISTRI_NAME="grml"