Kernel and init script cleanup.

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

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 285ba62..313bcf0 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -5,7 +5,7 @@ true                            hold_carnet_upgrade
 true                           install_keyrings        # update current keys
 true                           check_upgrade
 true                           check_reboot
-pkg x11-common                 remove_x
+pkg xserver-xorg               remove_x
 true                           remove_bloat
 true                           remove_cn_bloat
 true                           apt_listchanges disable
@@ -17,6 +17,7 @@ pkg slapd                     backup_slapd_db
 true                           backup_etc_dir          # etc i drugo
 true                           create_sources_list
 true                           apt_update
+true                           cleanup_available
 true                           check_archives_space
 true                           check_kernel_space
 true                           apt_download            # skini pakete
@@ -29,7 +30,7 @@ true                          restore_configs
 pkg munin-cn                   upgrade_munin
 # konacno, instalacija novih paketa
 pkg freeradius-aai             upgrade_freeradius
-pkg openldap-aai               upgrade_openldap
+pkg openldap-aai               pkgadd openldap-aai
 pkg amavisd-new                        upgrade_amavis
 pkg apache2-cn                 upgrade_apache2
 pkg postfix-cn                 upgrade_postfix
@@ -40,11 +41,14 @@ true                                upgrade first           # neki paketi moraju rucno
 true                           upgrade second          # neke pakete zelimo ranije
 true                           dist_upgrade            # instaliraj ostatak
 true                           install_new             # instaliraj nove
+pkg dhcp3-client               pkgadd isc-dhcp-client  # novi naziv za dhcp
 true                           remove_orphaned         # ocisti stare libove nakon sto su cn paketi nadogradjeni
 # i ostatak
 true                           add_group_proc          # za oidentd
-true                           pkgadd monit-cn
+true                           enable_monit
+true                           clean_old_kernels
 pkg kernel-2.6-cn              dpkg-reconfigure kernel-2.6-cn
+true                           clean_initd_packages
 true                           dpkg-reconfigure sysv-rc
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije