X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=0d64400a85007118dd1c722d7221cd84cd617825;hb=8a2a6fa288b2d869896b989632059c11ce977e48;hp=21b2e5878e4fb71a7295aeabbcfef7e83381b6aa;hpb=3aa0c2486c49100544ae0904c5e6119a58e3f89e;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 21b2e58..0d64400 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,5 +1,6 @@
 # Full upgrade
 true				first_warning
+true				second_warning
 true				check_my_version
 true				hold_carnet_upgrade
 true				install_keyrings	# update current keys
@@ -23,20 +24,26 @@ true				check_kernel_space
 true				apt_download		# skini pakete
 ! debconf_priority check	debconf_priority set	# utisaj debconf
 pkg monit			disable_monit
-true				upgrade_libc
 true				install_keyrings	# install new keys
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
+true				upgrade_syslog
+true				debconf_preload
 pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
+# by zelja, pinning na stare inačice
+pkg ocsinventory-agent-cn	fix_ocsinventory
+pkg bacula-cn			fix_bacula
+#
 pkg amavisd-new			upgrade_amavis
-pkg mysql-server-5.1		upgrade_mysql
+true				upgrade_mysql
 pkg apache2-cn			upgrade_apache2
 pkg postfix-cn			upgrade_postfix
 pkg dovecot-cn			upgrade_dovecot
 pkg bind9-cn			upgrade_bind
 pkg fail2ban-cn			upgrade_fail2ban
 pkg mailman-cn			upgrade_mailman
+pkg kernel-2.6-cn		upgrade_kernel
 true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
@@ -50,7 +57,7 @@ true				enable_monit
 true				clean_old_kernels
 pkg kernel-cn			dpkg-reconfigure kernel-cn
 true				clean_initd_packages
-true				dpkg-reconfigure sysv-rc
+pkg sysv-rc			dpkg-reconfigure sysv-rc
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije
 true				run_post_upgrade