clamav: fix database present check

[ipfire-2.x.git] / src / initscripts / packages / clamav

diff --git a/src/initscripts/packages/clamav b/src/initscripts/packages/clamav
index d2f63a9108dadff9b284218b63cfa53b9c5bfa2b..439c20579f5ea7c0691ba814e1fa4e371802ec6e 100644 (file)
--- a/src/initscripts/packages/clamav
+++ b/src/initscripts/packages/clamav
@@ -12,9 +12,12 @@ case "$1" in
 
                        COUNTER=0
                        while [ "$COUNTER" -lt "61" ]; do
+                               [ -e "/var/lib/clamav/main.cld" ] || \
                                [ -e "/var/lib/clamav/main.cvd" ] && \
-                                       [ -e "/var/lib/clamav/daily.cvd" ] || \
-                                       [ -e "/var/lib/clamav/daily.cld" ] && \
+                               [ -e "/var/lib/clamav/bytecode.cld" ] || \
+                               [ -e "/var/lib/clamav/bytecode.cvd" ] && \
+                               [ -e "/var/lib/clamav/daily.cld" ] || \
+                               [ -e "/var/lib/clamav/daily.cvd" ] && \
                                break
                                if [ "$COUNTER" -lt "1" ]; then
                                        boot_mesg -n "Downloading database"