X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-squeeze.mdwn;h=7573b37862672fa055af3e64d2da9e0e06e71d73;hb=4748598a49ca95a8569fb7638db087e00821ddeb;hp=04db62576cfeb6a3bfb720310a171f57e1b184ef;hpb=ac485b9ba25b4be3a795b4c7753b339166ebb8bc;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index 04db625..7573b37 100644
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -33,11 +33,6 @@ 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
 
 	dpkg --get-selections | awk '$2=="deinstall" {print $1}' &&
@@ -140,7 +135,7 @@ purge removed packages
 
 purge cruft that upgrade doesn't remove
 
-	apt-get remove --purge emacs22-common libxmlrpc-ruby libcap1 emacs22-nox emacs22-bin-common libvolume-id0 gcc-4.2-base ifenslave libopenssl-ruby1.8
+	apt-get remove --purge emacs22-common libxmlrpc-ruby libcap1 emacs22-nox emacs22-bin-common libvolume-id0 gcc-4.2-base ifenslave libopenssl-ruby1.8 mailx
 
 re-init samhain