Added clamav files to ucf handling.

[carnet-upgrade.git] / src / functions.sh

diff --git a/src/functions.sh b/src/functions.sh
index 7b9eae4..68996bc 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -134,6 +134,7 @@ remove_bloat() {
   text="$msg_remove_bloat"
 
   [ "$DEBUG" ] && set -x
+  n=0
   pkglist=$(mktemp /var/lib/carnet-upgrade/pkglist.XXXXXX)
   COLUMNS=200 dpkg -l | awk '$1 ~ /^.i/ { print $2 }' > $pkglist
   for i in $(echo "$bloats" | sed 's/          */      /g'| awk -F'    ' '{print $2}')
@@ -143,13 +144,15 @@ remove_bloat() {
       add_this="$(echo "$bloats" | egrep "     .*\b${i}\b" | sed 's/           */      /g'| awk -F'    ' '{print $1}')"
       if ! echo "$to_show" | grep -q "$add_this"; then
         to_show="$to_show \"$add_this\" \"\" on"
+        n=$(($n+1))
       fi
     fi
   done
   [ "$DEBUG" ] || rm -f $pkglist
   [ -z "$to_show" ] && return 0
+  test $n -gt 8 && n=8
   tmpfile=$(mktemp /var/lib/carnet-upgrade/dialog-tmp.XXXXXX)
-  cmd="dialog --nocancel --backtitle \""$title"\" --checklist \""$text"\" 20 75 8 $to_show"
+  cmd="dialog --nocancel --backtitle \""$title"\" --checklist \""$text"\" 20 75 $n $to_show"
   [ "$DEBUG" ] && set +x
     eval $cmd 2> $tmpfile
   [ "$DEBUG" ] && set -x
@@ -523,12 +526,14 @@ restore_configs () {
       done
   fi
 
-  # register cn changes in apache files
-  for config in /etc/php4/cgi/php.ini \
-                /etc/php4/cli/php.ini \
-                /etc/php4/apache/php.ini \
+  # register cn changes in ucf managed files
+  for config in /etc/apache/modules.conf \
+                /etc/clamav/clamd.conf \
+                /etc/clamav/freshclam.conf \
                 /etc/php4/apache2/php.ini \
-                /etc/apache/modules.conf
+                /etc/php4/apache/php.ini \
+                /etc/php4/cgi/php.ini \
+                /etc/php4/cli/php.ini
   do 
       config_backup=$config.$backup_ext
       if [ -e $config -a ! -e $config_backup ]; then