From: Zeljko Boros <Zeljko.Boros@carnet.hr>
Date: Mon, 26 Apr 2021 13:55:29 +0000 (+0200)
Subject: modifikacije functions.sh za ocsinventory i (sys)klogd
X-Git-Tag: debian/11.0.0~9
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=44f1007ba069e5c5c4c05c577e7dcad720234eb9;p=carnet-upgrade.git

modifikacije functions.sh za ocsinventory i (sys)klogd
---

diff --git a/src/functions.sh b/src/functions.sh
index 3825a4c..6f848af 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -968,6 +968,24 @@ EOF
 
 }
 
+# pinning za ocsinventory da se na nadogradi sa 2.0.4 na 2.4.2
+
+fix_bacula() {
+
+   echo "CN: Dodajem pinning ocsinventory-agenta na inačicu 2:2.0.4..."
+   PINFILE=/etc/apt/preferences.d/99-carnet
+
+   test -f $PINFILE || touch $PINFILE
+
+   cp-update ocsinventory-agent-cn $PINFILE <<EOF
+Package: ocsinventory-agent
+Pin: version 2:2.0.5*
+Pin-Priority: 1001
+EOF
+
+
+}
+
 # upgrade the IMAP server
 upgrade_dovecot() {
  # Funkcija koju je dodao Valentin da popravi propuste u dovecot-cn
@@ -1086,7 +1104,7 @@ upgrade_syslog() {
   fi
 
   pkgadd rsyslog
-  dpkg -P sysklogd klogd
+  dpkg -P sysklogd klogd > /dev/null 2>&1
 }
 
 # restore munin configs for silent upgrade