Fix inssrv warnings.

diff --git a/src/actions/main.queue b/src/actions/main.queue
index a78f8a2..39cab95 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -34,6 +34,7 @@ pkg amavisd-new                       upgrade_amavis
 pkg apache2-cn                 upgrade_apache2
 pkg postfix-cn                 upgrade_postfix
 pkg bind9-cn                   upgrade_bind
+true                           upgrade_mysql
 true                           upgrade_postgresql
 true                           upgrade first           # neki paketi moraju rucno
 true                           upgrade second          # neke pakete zelimo ranije
@@ -44,6 +45,7 @@ true                          remove_orphaned         # ocisti stare libove nakon sto su cn paketi nadogradje
 true                           add_group_proc          # za oidentd
 true                           pkgadd monit-cn
 pkg kernel-2.6-cn              dpkg-reconfigure kernel-2.6-cn
+true                           dpkg-reconfigure sysv-rc
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije
 true                           run_post_upgrade

diff --git a/src/data.sh b/src/data.sh
index 983ff86..eefcc1b 100644 (file)
--- a/src/data.sh
+++ b/src/data.sh
@@ -42,7 +42,7 @@ packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-squeeze/main/binar
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove or keep them back them.
 packages_first='
-libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd dhcp3-client
+libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd isc-dhcp-client ifupdown
 '
 
 # Packages that provide crucial services, upgrade them before the rest

diff --git a/src/functions.sh b/src/functions.sh
index 27fa13d..e9f8cdf 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -896,6 +896,15 @@ upgrade_openldap () {
   pkgadd openldap-aai
 }
 
+# handle mysql 5.0 to 5.1 upgrade
+upgrade_mysql () {
+  if pkg mysql-server || pkg mysql-server-5.0; then
+     pkgadd mysql-server
+     pkgrm mysql-server-5.0
+     /etc/init.d/mysql start
+  fi
+}
+
 # fix postgresql deinstallation during upgrade
 upgrade_postgresql () {
   if check_services show 2>&1 | grep -qw postgresql; then