Hold carnet-upgrade until the upgrade finishes.

[carnet-upgrade.git] / src / actions / main.queue

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 4dac0a7..98574fb 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,11 +1,12 @@
 # Full upgrade
 true                           first_warning
 true                           check_my_version
+true                           hold_carnet_upgrade
 true                           check_php_version
 true                           check_upgrade
 true                           check_grsec_kernel
 true                           check_reboot
-pkg xlibs                      remove_x
+pkg x11-common                 remove_x
 true                           remove_bloat
 true                           remove_cn_bloat
 true                           apt_listchanges disable
@@ -47,6 +48,7 @@ true                          upgrade first           # neki paketi moraju rucno
 true                           upgrade second          # neke pakete zelimo ranije
 true                           remove_orphaned         # ocisti stare libove nakon sto su cn paketi nadogradjeni
 true                           dist_upgrade            # instaliraj ostatak
+true                           install_new             # instaliraj nove
 # i ostatak
 true                           add_group_proc          # za oidentd
 true                           pkgadd monit-cn
@@ -58,5 +60,6 @@ true                          run_post_upgrade
 true                           apt_listchanges enable
 true                           debconf_priority reset
 true                           fix_issue
+true                           release_carnet_upgrade
 # i konacno, provjeri da li stvari rade
 true                           check_services postupgrade