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 a6674d0..a53c71d 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,7 +1,12 @@
 # Full upgrade
 true                           first_warning
+true                           hold_carnet_upgrade
+true                           fix_sarge_sources
+true                           check_my_version
 true                           check_apache_version
 true                           check_upgrade
+true                           check_grsec_kernel
+pkg xlibs                      remove_x
 true                           remove_bloat
 true                           apt_listchanges disable
 true                           comment_force_overwrite # ruzna opcija za dpkg
@@ -12,8 +17,10 @@ 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
 pkg monit                      disable_monit
 true                           upgrade_libc
@@ -44,5 +51,6 @@ true                          apt_listchanges enable
 #  - izvrsi sve uvjetne post_upgrade akcije
 true                           run_post_upgrade
 true                           fix_issue
+true                           release_carnet_upgrade
 # i konacno, provjeri da li stvari rade
 true                           check_services postupgrade