X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=95dc3431e5fa53a29dcee7b253e5c2d46d460aa2;hb=0d61ec643fce980d271cacd1b6dd866e01ef393c;hp=3825a4c2c96cc95bc451364311c614f85630f678;hpb=5fe31b9531df1ee2f0b14881b126b33929eb5601;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 3825a4c..95dc343 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -4,6 +4,8 @@
 
 PHPVER="7.3"
 MDB="10.3"
+PINFILE="/etc/apt/preferences.d/99-carnet"
+
 
 notice () {
   LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75
@@ -947,7 +949,6 @@ upgrade_postfix () {
 fix_bacula() {
 
    echo "CN: Dodajem pinning bacule na inačicu 7.4.4..."
-   PINFILE=/etc/apt/preferences.d/99-carnet
 
    test -f $PINFILE || touch $PINFILE
 
@@ -965,6 +966,20 @@ Pin: version 7.4.4*
 Pin-Priority: 1001
 EOF
 
+}
+
+# pinning za ocsinventory da se na nadogradi sa 2.0.4 na 2.4.2
+
+fix_ocsinventory() {
+
+   echo "CN: Dodajem pinning ocsinventory-agenta na inačicu 2.0.4..."
+   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
 
 }
 
@@ -1086,7 +1101,7 @@ upgrade_syslog() {
   fi
 
   pkgadd rsyslog
-  dpkg -P sysklogd klogd
+  dpkg -P sysklogd klogd > /dev/null 2>&1
 }
 
 # restore munin configs for silent upgrade