updates to squeeze upgrade notes, including about puppet

[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 b7bbcc7..2f16b41 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
 
@@ -44,6 +48,7 @@ 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)
 
@@ -71,9 +76,25 @@ 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
 
@@ -96,10 +122,9 @@ possibly reboot
 re-enable exim, samhain
 
        mv /etc/rc2.d/K02exim4 /etc/rc2.d/S02exim4
-       env -i /etc/init.d/exim4 start
-
        mv /etc/rc2.d/K02samhain /etc/rc2.d/S02samhain
        env -i /etc/init.d/exim4 start
+       env -i /etc/init.d/samhain
 
        insserv