X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=7e8ae18ec38d69015de7905ebaf6cc9638873700;hb=ee97dd6a97fcb7ebf5f48f28fabcd18af9fcc408;hp=4fb017d07241121d9c530bfed973a38e054ccd69;hpb=76df4be0475a22d848755eda27ce23845df70279;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 4fb017d..7e8ae18 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -2,6 +2,7 @@
 true				first_warning
 true				check_apache_version
 true				check_upgrade
+pkg xlibs			remove_x
 true				remove_bloat
 true				apt_listchanges disable
 true				comment_force_overwrite	# ruzna opcija za dpkg
@@ -12,10 +13,12 @@ true				remove_group_proc	# calls post_upgrade add_group_proc
 pkg slapd			backup_slapd_db
 true				backup_etc_dir		# etc i drugo
 true				create_sources_list
-true				update			# apt-get update & download
-true				check_disk_space
+true				apt_update
+true				check_archives_space
+true				check_kernel_space
+true				apt_download 		# skini pakete
 ! debconf_priority check	debconf_priority set	# utisaj debconf
-# postgresql-common/etch zahtjeva da postgresql nije instaliran
+pkg monit			disable_monit
 true				upgrade_libc
 true				install_keyrings
 pkg skey-cn			remove_skey
@@ -24,10 +27,8 @@ pkg mrtg-cn			post_upgrade pkgadd munin-cn
 pkg mrtg-cn			pkgrm mrtg-cn
 # popravi konfiguracije koje stvaraju probleme
 true				restore_configs
-# monit stvara probleme postinst skriptama
-pkg monit-cn			pkgrm monit-cn
 # konacno, instalacija novih paketa
-pkg amavisd-cn			upgrade_amavis
+pkg amavisd-new			upgrade_amavis
 pkg apache2-cn			upgrade_apache2
 pkg dovecot-cn			upgrade_dovecot
 pkg postfix-cn			upgrade_postfix