From 70908c56748065c0c28890f2a92e3269f0999efa Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tobias@T-POWA-LX.(none)>
Date: Sat, 25 Jul 2009 14:30:17 +0200
Subject: [PATCH] change clamav db files to ondisk

---
 lib/initcpio/hooks/arch_clamav   | 10 ++++++++++
 lib/initcpio/install/arch_clamav |  4 ++--
 usr/bin/archboot-allinone.sh     |  8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 lib/initcpio/hooks/arch_clamav

diff --git a/lib/initcpio/hooks/arch_clamav b/lib/initcpio/hooks/arch_clamav
new file mode 100644
index 000000000..039b5919e
--- /dev/null
+++ b/lib/initcpio/hooks/arch_clamav
@@ -0,0 +1,10 @@
+run_hook ()
+{
+    # add symlink for db files
+    ln -sf /src/clamav /var/lib/clamav
+    echo "ARCH_CLAMAV USAGE:"
+    echo "--------------------"
+    echo "  Mount your boot media to /src to use ondisk clamav db files." 
+    echo "  If you want up to date db files use the freshclam program."
+    echo "--------------------"
+}
diff --git a/lib/initcpio/install/arch_clamav b/lib/initcpio/install/arch_clamav
index a90467109..99da8ad51 100644
--- a/lib/initcpio/install/arch_clamav
+++ b/lib/initcpio/install/arch_clamav
@@ -5,10 +5,10 @@ install ()
     MODULES=""
     BINARIES="clamscan freshclam"
     FILES=""
-    SCRIPT=""
+    SCRIPT="arch_clamav"
     # add /var directories
     add_dir "/var/run/clamav"
-    add_dir "/var/lib/clamav"
+    add_dir "/var/lib/"
     add_dir "/var/log/clamav"
     add_file "/usr/share/archboot/clamav/etc/clamav/freshclam.conf" "/etc/clamav/freshclam.conf"
     # add unrar support
diff --git a/usr/bin/archboot-allinone.sh b/usr/bin/archboot-allinone.sh
index c28bfa1e4..79b02edc4 100755
--- a/usr/bin/archboot-allinone.sh
+++ b/usr/bin/archboot-allinone.sh
@@ -73,6 +73,7 @@ ALLINONE=$(mktemp -d /tmp/allinone.XXX)
 # create directories
 mkdir ${ALLINONE}/arch
 mkdir ${ALLINONE}/isolinux
+mkdir ${ALLINONE}/clamav
 
 # extract tarballs
 tar xvf lowmem-i686.tar -C ${LOWMEM} || exit 1
@@ -88,6 +89,13 @@ mv ${LOWMEM}/tmp/*/core-any ${ALLINONE}/
 # move in doc
 mv ${CORE}/tmp/*/arch/archdoc.txt ${ALLINONE}/arch/
 
+# copy in clamav db files
+if [ -d /var/lib/clamav ]; then
+    cp /var/lib/clamav/daily.cvd ${ALLINONE}/clamav/
+    cp /var/lib/clamav/main.cvd ${ALLINONE}/clamav/
+    cp /var/lib/clamav/mirrors.dat ${ALLINONE}/clamav/
+fi
+
 # place kernels and memtest
 mv ${LOWMEM}/tmp/*/isolinux/vmlinuz ${ALLINONE}/isolinux/
 mv ${LOWMEM64}/tmp/*/isolinux/vmlinuz ${ALLINONE}/isolinux/vm64