From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 17 Mar 2011 22:15:58 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f8cb197ae628ee39b3a82e433b396b40957fe8f9;hp=00dd3be110be88eb0fb432a2c2593835fd7bfde7;p=mirror%2Fdsa-wiki.git

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-wiki

* 'master' of git+ssh://db.debian.org/git/dsa-wiki:
  spacing
  upgrade updates
  duplicate line
  further improvments to squeeze procedure
  further improvments to squeeze procedure
  reorder and fix

Conflicts:
	input/howto/upgrade-to-squeeze.mdwn
---

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index b7bbcc7..b14ea72 100644
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -93,13 +93,19 @@ 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
-	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