X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=0af728bf701decf0cbe1aadd0dfe5e9b1084cb6b;hb=a97320a33fcf92f0c683b0830dbf700b88726a99;hp=62dbbe7b43c197c94dbe08fba2103790a2d0e9bd;hpb=2eebaf5e6b78a8b4fce045ca325ab5544fcd32c4;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 62dbbe7..0af728b 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -2,11 +2,15 @@
 # Zoran 'jelly' Dzelajlija <jelly@srce.hr>
 
 notice () {
-  dialog --backtitle "$title" --msgbox "$*" 18 75
+  LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75
 }
 
 first_warning () {
-  dialog --backtitle "$title" --yesno "$msg_first_warning" 18 75
+  LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_first_warning" 18 75
+  if [ $? -ne 0 ]; then
+    log "Upgrade canceled."
+    exit 0
+  fi
 }
 
 pkg() {
@@ -109,13 +113,17 @@ pkgrm () {
   }
 }
 
-update() {
+apt_update() {
   log "Running apt-get update ..."
   apt-get -y$s update || {
     apt-get -yf install
     apt-get -y$s update
   }
   apt-get autoclean
+}
+
+apt_download() {
+  log "Running apt-get download ..."
   apt-get -dy$s dist-upgrade
 }
 
@@ -127,6 +135,16 @@ dist_upgrade () {
   }
 }
 
+remove_x() {
+  LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_remove_x" 18 75
+  if [ $? -eq 0 ]; then
+    log "Removing X Window System"
+    pkgrm xlibs
+  else
+    log "Skipping X Window System removal"
+  fi
+}
+
 remove_bloat() {
   local to_remove add_this i j n text to_show cmd tmpfile installed
   local update_selections pkgs_to_deselect pkgs_to_remove oldifs pkglist
@@ -151,7 +169,7 @@ remove_bloat() {
   [ -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 $n $to_show"
+  cmd="LC_MESSAGES=hr_HR dialog --nocancel --backtitle \""$title"\" --checklist \""$text"\" 20 75 $n $to_show"
   [ "$DEBUG" ] && set +x
     eval $cmd 2> $tmpfile
   [ "$DEBUG" ] && set -x
@@ -231,8 +249,13 @@ run_actions() {
     [ "$check" != "true" ] && checkmsg="if '$check'"
     if eval $check; then
       log "$(printf 'action %02d' $lineno) starting: '${action}' $checkmsg "
-      eval $action
-      log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
+      if ! eval $action; then
+        log "$(printf 'action %02d' $lineno) failed: '${action}' $checkmsg "
+        display_action_failure "$action"
+        exit 1
+      else  
+        log "$(printf 'action %02d' $lineno) finished: '${action}' $checkmsg"
+      fi
     else
       log "$(printf 'action %02d' $lineno) skipping: '${action}' $checkmsg"
     fi
@@ -242,6 +265,24 @@ run_actions() {
   log "-----"
 }
 
+# report action failure
+display_action_failure () {
+  local action=$1
+
+  notice "
+Doslo je do greske prilikom izvrsavanja akcije '$action'. Detalje problema moguce je vidjeti u log datotekama:
+
+  /var/log/carnet-upgrade.log
+  /var/log/carnet-upgrade.typescript
+
+Da bi dovrsili zapocete operacije nad paketima pokrenite:
+
+  # dpkg --configure -a
+  # apt-get -f install
+
+Nakon toga ponovno pozovite carnet-upgrade skriptu."
+}
+
 # funkcija vraca popis paketa koje treba upgradeati
 what_upgrade () {
   local IFSOLD name version package
@@ -493,7 +534,6 @@ restore_configs () {
   local config_backup
 
   pkg base-files lt 4 && restore_config /etc/issue /etc/issue.net
-  pkg bind9 lt 1:9.3.4 && restore_config /etc/bind/named.conf.options
   pkg libpam-modules lt 0.79 && restore_config /etc/security/limits.conf
   pkg login lt 1:4.0.18.1 && restore_config /etc/pam.d/login
   pkg mysql-server lt 5.0.3 && restore_config /etc/init.d/mysql \
@@ -533,11 +573,7 @@ restore_configs () {
   # 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/php4/apache/php.ini \
-                /etc/php4/cgi/php.ini \
-                /etc/php4/cli/php.ini
+                /etc/clamav/freshclam.conf
   do 
       config_backup=$config.$backup_ext
       if [ -e $config -a ! -e $config_backup ]; then
@@ -578,7 +614,7 @@ install_keyrings () {
   pkgadd dpkg apt debconf python-apt
 
   dpkg-reconfigure carnet-keyring srce-keyring
-  update
+  apt_update
 }
 
 # remove skey (not supported anymore)
@@ -591,6 +627,22 @@ remove_skey () {
   fi
 }
 
+# monit it causing problems for postinst scripts
+# restarting daemons so try to disable it
+disable_monit () {
+  if pkg monit-cn; then
+    pkgrm monit-cn # disables monit in prerm
+  fi
+
+  # if configured manually
+  if pkg monit; then
+    # remove the binary but leave the config
+    apt-get remove --yes monit
+    # stop the binary
+    pkill -9 monit || true
+  fi
+}
+
 # make a silent upgrade to new libc6
 upgrade_libc () {
   DEBIAN_FRONTEND=noninteractive pkgadd libc6
@@ -600,10 +652,6 @@ upgrade_libc () {
 upgrade_apache2 () {
   local package packages
 
-  # php-suhosin-cn causes removal of applications on dist-upgrade
-  # because of php5 only dependencies
-  pkgrm php-suhosin-cn
-
   for package in \
       libapache2-mod-php4 \
       php4-cli \
@@ -611,16 +659,20 @@ upgrade_apache2 () {
       php4-cn \
       apache2-cn \
       php4-odbc \
-      php4-suhosin
+      php4-suhosin \
+      php-suhosin-cn
   do
       if pkg $package; then
           packages="$packages $package"
       fi
   done
 
-  for package in $(echo $packages); do
-      pkgadd $package
-  done
+  # enable suhosin downgrade to etch version
+  if pkg php4-suhosin; then
+      pkgrm php4-suhosin php-suhosin-cn
+  fi
+
+  eval pkgadd $packages
 }
 
 upgrade_amavis () {
@@ -633,10 +685,11 @@ upgrade_amavis () {
   fi
 
   # move old config aside
-  conf=/etc/amavis/amavisd.conf
-  if [ -e $conf -a ! -e $conf.$backup_ext ]; then
-    mv -v $conf $conf.$backup_ext
-  fi
+  for conf in /etc/amavisd.conf /etc/amavis/amavisd.conf; do
+    if [ -e $conf -a ! -e $conf.$backup_ext ]; then
+      mv -v $conf $conf.$backup_ext
+    fi
+  done
 
   # install new packages
   pkgadd amavisd-cn amavisd-new
@@ -766,12 +819,98 @@ Debian GNU/Linux 4.0 (CARNet Debian 4.0) %h
 EOF
 }
 
-check_disk_space() {
-  local available_disk_space
-  available_disk_space=$(df -m /var|tail -1|awk '{print $4}')
-  if [ $available_disk_space -lt $min_var_space ]; then
-    log "carnet-upgrade aborted: not enough space on /var (need ${min_var_space}MB)"
-    notice "Premalo mjesta na /var particiji. Potrebno je imati barem ${min_var_space}MB."
+check_archives_space() {
+  local available_disk_space archives_size
+  available_disk_space=$(free_space /var/cache/apt/archives/)
+  archives_size=$(download_size dist-upgrade)
+
+  log "Archives space: ${available_disk_space}MB"
+  log "Download size: ${archives_size}MB"
+
+  if [ $available_disk_space -lt $archives_size ]; then
+    log "carnet-upgrade aborted: not enough space in /var/cache/apt/archives/ (have ${available_disk_space}MB, need ${archives_size}MB)"
+    notice "Premalo slobodnog mjesta u /var/cache/apt/archives/ za skidanje paketa (potrebno je barem ${archives_size}MB). Procitajte poglavlje 'Izvanredne situacije' u dokumentaciji."
+    exit 1
+  fi
+}
+
+check_kernel_space() {
+  local available_disk_space kernel_size
+  available_disk_space=$(free_space /)
+  kernel_size=$(installed_size kernel-2.6-cn)
+
+  log "Free space in /: ${available_disk_space}MB"
+  log "Kernel size: ${kernel_size}MB"
+
+  if LC_ALL=C apt-get --yes --print-uris install kernel-2.6-cn \
+     | grep -q '^kernel-2.6-cn is already the newest version.$'
+  then
+     log "Not checking free space in /: kernel-2.6-cn already installed"
+     return
+  fi
+
+  if [ $available_disk_space -lt $kernel_size ]; then
+    log "carnet-upgrade aborted: not enough space in / (have ${available_disk_space}MB, need ${kernel_size}MB)"
+    notice "Premalo mjesta u / za instalaciju kernela (potrebno je barem ${kernel_size}MB). Procitajte poglavlje 'Izvanredne situacije' u dokumentaciji."
     exit 1
   fi
 }
+
+free_space() {
+  df --portability --block-size=1M "$1" | tail -1 | awk '{print $4}'
+}
+
+download_size() {
+  local size
+  size=$(LC_ALL=C apt-get --yes --print-uris "$@" \
+         | sed -n '/^Need to get / {s///; s/B\/.*//; p}')
+
+  size_to_mb "${size}B"
+}
+
+installed_size() {
+  local package size
+  package=$1
+  size=$(apt-cache show $package \
+         | awk '$1 == "Installed-Size:" {print $2; exit}')
+
+  size_to_mb "${size}kB"
+}
+
+size_to_mb() {
+  local size
+  size=$1
+  if [ -z "$size" ]; then
+    size=0;
+  fi
+
+  if [ "${size%kB}" != "$size" ]; then
+    size=$(round ${size%kB})
+    size=$(($size/1024+1))
+  elif [ "${size%MB}" != "$size" ]; then
+    size=$(round ${size%MB})
+  elif [ "${size%GB}" != "$size" ]; then
+    size=$(round ${size%GB})
+    size=$(($size*1024))
+  elif [ "${size%[0-9]B}" != "$size" ]; then
+    size=$(round ${size%B})
+    size=$(($size/1024/1024+1))
+  else
+    log "unrecognized size unit: $size"
+    return 1
+  fi
+
+  echo $size
+}
+
+round() {
+  local num
+  num=$1
+
+  if [ "${num%.*}" != "$num" ]; then
+    num=${num%.*}
+    num=$(($num+1))
+  fi
+
+  echo $num
+}