zobel suggested upgrading apt and dpkg first

[mirror/dsa-wiki.git] / input / howto / upgrade-to-squeeze.mdwn

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index 0f6f416..18b69a3 100644 (file)
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -21,6 +21,10 @@ install deborphan, clean up
        orphaner -a
        orphaner -a -n
 
+unhold puppet
+
+       echo puppet install | dpkg --set-selections &&
+       echo puppet-common install | dpkg --set-selections
 
 purge removed packages
 
@@ -38,12 +42,13 @@ update apt list
 
 upgrade
 
-       apt-get install locales-all
+       apt-get install locales-all apt dpkg
 
 rest follows
 
        apt-get dist-upgrade
 
+use dash as system shell (/bin/sh).
 
 reject changes to /etc/pam.d/sudo (puppet will install a new file later anyway)
 
@@ -65,7 +70,7 @@ update dsa-puppet.git (add to squeeze list in local.yaml)
 
 do a puppet run:
 
-       puppetd -t
+       puppetd -t; puppetd -t; puppetd -t
 
 upgrade once more (security etc)
 
@@ -88,13 +93,9 @@ Do the same for grub/grub-pc if you did upgrade-from-grub-legacy
        (reboot)
        upgrade-from-grub-legacy
        (reboot)
-       apt-get purge grub
+       apt-get purge grub &&
        apt-get install grub-pc
 
-check for obsolete packages
-
-       /usr/lib/nagios/plugins/dsa-check-packages
-
 clean up old libs
 
        orphaner
@@ -102,6 +103,12 @@ clean up old libs
        orphaner -a
        orphaner -a -n
 
+check for unneeded/obsolete packages
+
+       apt-get autoremove
+
+       /usr/lib/nagios/plugins/dsa-check-packages
+
 purge removed packages
 
        dpkg --get-selections | awk '$2=="deinstall" {print $1}' &&