Execute freshclam only if class FRESHCLAM is set

A current grml-full daily ISO has ~360MB without freshclam data,
including freshclam data it has ~429MB - this isn't worth the disk space,
especially as you're interested in up2date definitions anyway and
freshclam can be executed on the live ISO then.

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index 8b2f8a1..1c6a0e7 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -318,6 +318,10 @@ selected. The following classes are predefined:
 
 * DEBORPHAN: get rid of all packages listed in output of deborphan
 
 
 * 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
 * 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

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/92-update-freshclam b/etc/grml/fai/config/scripts/GRMLBASE/92-update-freshclam
index 2996c20..3275bb1 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/92-update-freshclam
+++ b/etc/grml/fai/config/scripts/GRMLBASE/92-update-freshclam
@@ -11,6 +11,12 @@ if ifclass NO_ONLINE ; then
   exit 0
 fi
 
   exit 0
 fi
 

+if ! ifclass FRESHCLAM ; then
+  echo "Ignoring script 92-update-freshclam as FRESHCLAM is NOT set."
+  echo "Executing freshclam increases the ISO for ~70MB, not considering as default."
+  exit 0
+fi
+

 set -u
 
 bailout() {
 set -u
 
 bailout() {