Hold carnet-upgrade until the upgrade finishes.

This should prevent accidental sarge -> lenny upgrades.

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 3b93066..a53c71d 100644 (file)
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,5 +1,6 @@
 # Full upgrade
 true                           first_warning
+true                           hold_carnet_upgrade
 true                           fix_sarge_sources
 true                           check_my_version
 true                           check_apache_version
@@ -50,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

diff --git a/src/functions.sh b/src/functions.sh
index 66021e4..b979234 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1025,3 +1025,12 @@ round() {
 
   echo $num
 }
+
+# make sure carnet-upgrade doesn't get upgraded until the end
+hold_carnet_upgrade() {
+  echo carnet-upgrade hold | dpkg --set-selections
+}
+
+release_carnet_upgrade() {
+  echo carnet-upgrade install | dpkg --set-selections
+}