X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-squeeze.mdwn;h=2f16b417252098a1da3b39bed181b4d4d0baf1a9;hb=5fc6feaf7e94cdb72cc0ca3a57bb9f153e27cf84;hp=0f6f4166df9e46e0c40696e2be832735f323f7c9;hpb=c02c283aac2bd80d52de0084b104738270d21618;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index 0f6f416..2f16b41 100644
--- 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)
 
@@ -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}' &&