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 (file)
--- 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