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/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=f8cb197ae628ee39b3a82e433b396b40957fe8f9

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
---

f8cb197ae628ee39b3a82e433b396b40957fe8f9
diff --cc input/howto/upgrade-to-squeeze.mdwn
index 26baa82,b7bbcc7..b14ea72
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@@ -94,17 -93,17 +93,23 @@@ re-init samhai
  
  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
+ re-enable exim, samhain
  
- 	mv /etc/rc2.d/K20exim4 /etc/rc2.d/S20exim4
+ 	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
+ 
+ re-init samhain
  
  
  ### Problems with CCISS