Don't overwrite user modified issue files.

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

diff --git a/src/functions.sh b/src/functions.sh
index 8a76e8b..9040822 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -157,7 +157,7 @@ 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
+    pkgrm x11-common
   else
     log "Skipping X Window System removal"
   fi
@@ -603,6 +603,13 @@ upgrade () {
   pkgadd_if_installed $packages
 }
 
+# install packages introduced in this release
+install_new () {
+  if [ "$new_packages" ]; then
+    pkgadd $new_packages
+  fi
+}
+
 # funkcija utrpa ispravan sources.list
 create_sources_list () {
     local sl sl_new
@@ -895,49 +902,6 @@ restore_configs () {
      restore_file /etc/monit/monitrc $config_new
      rm -f $config_new
   fi
-
-#  restore_config login 1:4.0.18.1 /etc/pam.d/login
-#  restore_config mysql-server 5.0.3 /etc/init.d/mysql \
-#                                    /etc/logrotate.d/mysql-server \
-#                                    /etc/mysql/my.cnf
-#  restore_config ntpdate 1:4.2.2 /etc/default/ntpdate
-#  restore_config oidentd 2.0.8 /etc/default/oidentd
-#  restore_config slapd 2.3.30 /etc/default/slapd /etc/init.d/slapd
-#  restore_config squirrelmail 2:1.4.9a /etc/squirrelmail/apache.conf
-#  restore_config vsftpd 2.0.5 /etc/vsftpd.conf
-#  restore_config xinetd 1:2.3.14 /etc/xinetd.conf
-#
-#  # orphaned config file - no owner
-#  if pkg logcheck-database lt 1.2.54; then
-#      rm -vf /etc/logcheck/ignore.d.server/imap
-#  fi
-#
-#  # aide switched to ucf, move old configs aside
-#  if pkg aide lt 0.13.1; then
-#      for file in /etc/aide/aide.conf \
-#                  /etc/cron.daily/aide \
-#                  /etc/default/aide;
-#      do
-#          if [ ! -e "$file.$backup_ext" ]; then
-#              mv -v "$file" "$file.$backup_ext"
-#          fi
-#
-#          rm -vf "$file"
-#      done
-#  fi
-#
-#  # register cn changes in ucf managed files
-#  for config in /etc/apache/modules.conf \
-#                /etc/clamav/clamd.conf \
-#                /etc/clamav/freshclam.conf
-#  do 
-#      config_backup=$config.$backup_ext
-#      if [ -e $config -a ! -e $config_backup ]; then
-#          log "Saving config file $config"
-#          cp -av $config $config_backup
-#          ucf $config_backup $config
-#      fi
-#  done
 }
 
 # temporary disable listchanges packages to reduce clutter during upgrade
@@ -1062,6 +1026,7 @@ upgrade_libc () {
 
 # upgrade apache2/php5 to lenny
 upgrade_apache2 () {
+  pkgrm apache-common # prevents installation of apache2-suexec
   pkgadd_if_installed libapache2-mod-php5 php5-cli php5-cn apache2-cn \
     php5-odbc php5-suhosin php-suhosin-cn
 }
@@ -1219,38 +1184,6 @@ get_variable () {
   echo $val
 }
 
-# preserve mail location on upgrade
-upgrade_dovecot () {
-  local default_mail_env mail_location
-
-  # check if already upgraded
-  if ! pkg dovecot-common lt 1.0; then
-      return
-  fi
-
-  # save old mail location
-  default_mail_env=$(get_variable default_mail_env /etc/dovecot/dovecot.conf)
-
-  # silently upgrade package
-  restore_file /etc/dovecot/dovecot.conf
-  pkgadd dovecot-cn
-
-  # insert old mail location
-  mail_location=$(get_variable mail_location /etc/dovecot/dovecot.conf)
-  if [ "$default_mail_env" -a ! "$mail_location" ]; then
-      check_and_sed '^#mail_location[[:space:]]*=' \
-                   "s|#mail_location[[:space:]]*=.*|mail_location = $default_mail_env|" /etc/dovecot/dovecot.conf || return 0
-
-      if [ -x /etc/init.d/dovecot ]; then
-          if [ -x /usr/sbin/invoke-rc.d ]; then
-              /usr/sbin/invoke-rc.d dovecot restart
-          else
-              /etc/init.d/dovecot restart
-          fi
-      fi
-  fi
-}
-
 # restore munin configs for silent upgrade
 upgrade_munin () {
   local config backup hostname domain
@@ -1307,15 +1240,22 @@ comment_force_overwrite () {
   fi
 }
 
+# try not to overwrite user modified issue files
 fix_issue () {
-  cat > /etc/issue <<EOF
+  if cmp /etc/issue $cnup/files/etc/issue.expect.lenny >/dev/null; then
+    cp -av /etc/issue /etc/issue.$backup_ext
+    cat > /etc/issue <<EOF
 Debian GNU/Linux 5.0 (CARNet Debian 5.0) \\n \\l
 
 EOF
+  fi
 
-  cat > /etc/issue.net <<EOF
+  if cmp /etc/issue.net $cnup/files/etc/issue.net.expect.lenny >/dev/null; then
+    cp -av /etc/issue.net /etc/issue.net.$backup_ext
+    cat > /etc/issue.net <<EOF
 Debian GNU/Linux 5.0 (CARNet Debian 5.0) %h
 EOF
+  fi
 }
 
 check_archives_space() {
@@ -1339,19 +1279,26 @@ check_archives_space() {
 }
 
 check_kernel_space() {
-  local available_disk_space kernel_size
+  local available_disk_space kernel_size linux_images pkg ret
   available_disk_space=$(free_space /)
-  kernel_size=$(installed_size kernel-2.6-cn)
+  linux_images=$(apt-cache show kernel-2.6-cn | grep ^Depends: \
+    | grep -o 'linux-image[^ ]*')
+  for pkg in $linux_images; do
+    kernel_size=$(installed_size $pkg)
+    ret=$?
+    [ $ret -eq 0 ] && break
+  done
 
-  if [ $? -ne 0 ]; then
+  if [ $ret -ne 0 ]; then
     log "Failed to get installed size, skipping check."
     return 0
   fi
 
   log "Free space in /: ${available_disk_space}MB"
+  log "Kernel package: $pkg"
   log "Kernel size: ${kernel_size}MB"
 
-  if LC_ALL=C apt-get --yes --print-uris install kernel-2.6-cn \
+  if LC_ALL=C apt-get -s 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"
@@ -1436,3 +1383,12 @@ round() {
 
   echo $num
 }
+
+# make sure carnet-upgrade doesn't get upgraded until the end
+hold_carnet_upgrade() {
+  echo carnet-upgrade hold | dpkg --set-selections
+}
+
+release_carnet_upgrade() {
+  echo carnet-upgrade install | dpkg --set-selections
+}