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 b14ea72..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,15 +70,31 @@ 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)
 
        apt-get update && apt-get dist-upgrade
 
-check for obsolete packages
+if you are moving from a dsa kernel to a debian kernel, add non-free to sources list, then
 
-       /usr/lib/nagios/plugins/dsa-check-packages
+       apt-get install firmware-linux
+
+maybe also
+
+       apt-get install firmware-bnx2
+
+clean up transitions
+
+       dpkg --purge dhcp3-client && apt-get install isc-dhcp-client  # mark as non-auto
+
+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 install grub-pc
 
 clean up old libs
 
@@ -82,6 +103,11 @@ 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
 
@@ -93,13 +119,6 @@ re-init samhain
 
 possibly reboot
 
-maybe do:
-       upgrade-from-grub-legacy
-       apt-get purge grub
-       apt-get install grub-pc
-       apt-get purge dhcp3-client
-       apt-get install isc-dhcp-client
-
 re-enable exim, samhain
 
        mv /etc/rc2.d/K02exim4 /etc/rc2.d/S02exim4