X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=56fab41ee903d01cee17bae5222887d57d142743;hb=4074b9d44bfb05fb8ae0645085c339d1da4d2e78;hp=c075a880b8086eb66359c542f43cea4a49b61535;hpb=7a88bf24e860e4f1095fbf6da721e3c4f6ec265f;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index c075a88..56fab41 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -888,11 +888,6 @@ upgrade_amavis () {
 
 # handle mysql 5.0 to 5.1 upgrade
 upgrade_mysql () {
-  # libc6-dev prevents mysql upgrade
-  if pkg libc6-dev; then
-     pkgrm libc6-dev
-  fi
-
   if pkg mysql-server || pkg mysql-server-5.1; then
      pkgadd mysql-server
      dpkg -P mysql-server-5.1
@@ -1016,6 +1011,11 @@ get_variable () {
 
 # switch to rsyslog
 upgrade_syslog() {
+  # libc6-dev prevents upgrade
+  if pkg libc6-dev; then
+     pkgrm libc6-dev
+  fi
+
   pkgadd rsyslog
   dpkg -P sysklogd klogd
 }