From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Fri, 22 Nov 2013 07:46:07 +0000 (+0100)
Subject: Install rsyslog instead of sysklogd.
X-Git-Tag: debian/7.0.9~1
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=7a88bf24e860e4f1095fbf6da721e3c4f6ec265f;p=carnet-upgrade.git

Install rsyslog instead of sysklogd.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index c892246..ec7207c 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -26,6 +26,7 @@ pkg monit			disable_monit
 true				install_keyrings	# install new keys
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
+pkg sysklogd			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 780c3b8..c075a88 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1014,6 +1014,12 @@ get_variable () {
   echo $val
 }
 
+# switch to rsyslog
+upgrade_syslog() {
+  pkgadd rsyslog
+  dpkg -P sysklogd klogd
+}
+
 # restore munin configs for silent upgrade
 upgrade_munin () {
   local config backup hostname domain