X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=blobdiff_plain;f=src%2Ffunctions.sh;fp=src%2Ffunctions.sh;h=6f848aff7a6337078df2358340c32fabe9b56726;hp=3825a4c2c96cc95bc451364311c614f85630f678;hb=44f1007ba069e5c5c4c05c577e7dcad720234eb9;hpb=5fe31b9531df1ee2f0b14881b126b33929eb5601

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