Double check rsyslog installation.

diff --git a/src/actions/main.queue b/src/actions/main.queue
index ec7207c..0ab021f 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -26,7 +26,7 @@ pkg monit                     disable_monit
 true                           install_keyrings        # install new keys
 # popravi konfiguracije koje stvaraju probleme
 true                           restore_configs
-pkg sysklogd                   upgrade_syslog
+true                           upgrade_syslog
 pkg munin-cn                   upgrade_munin
 # konacno, instalacija novih paketa
 pkg amavisd-new                        upgrade_amavis

diff --git a/src/functions.sh b/src/functions.sh
index c075a88..56fab41 100644 (file)
--- 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
 }