From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 17 Mar 2011 22:43:32 +0000 (+0100)
Subject: merge zobel's version and mine
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=0c0bb3f75a49f1fdb309cdb845eda5a0ddb228b1

merge zobel's version and mine
---

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index 8e6ffaa..e1e8a75 100644
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -71,6 +71,16 @@ upgrade once more (security etc)
 
 	apt-get update && apt-get dist-upgrade
 
+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
+
+	upgrade-from-grub-legacy
+	apt-get purge grub
+	apt-get install grub-pc
+
 check for obsolete packages
 
 	/usr/lib/nagios/plugins/dsa-check-packages
@@ -82,7 +92,6 @@ clean up old libs
 	orphaner -a
 	orphaner -a -n
 
-
 purge removed packages
 
 	dpkg --get-selections | awk '$2=="deinstall" {print $1}' &&
@@ -93,14 +102,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