X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-squeeze.mdwn;h=829e8eb470fbb46ac8fc17d43757ffada2811fb2;hb=df09d9faf9de3e75b82152da05d6a7b7a1cfd85a;hp=8e6ffaa695bdc116e5b96d8b45e42b668761c08f;hpb=a319acaaa536a88d67a175f75c80fca682581d26;p=mirror%2Fdsa-wiki.git

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index 8e6ffaa..829e8eb 100644
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -1,6 +1,14 @@
 
 # Upgrade from lenny to squeeze
 
+on buildds:
+
+	cd ~buildd
+	sudo su - buildd
+	touch NO-DAEMON-PLEASE EXIT-DAEMON-PLEASE && exit
+
+	now wait for the buildd to quit
+
 turn off samhain
 
 	/etc/init.d/samhain stop &&
@@ -21,6 +29,10 @@ 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
 
@@ -38,12 +50,13 @@ update apt list
 
 upgrade
 
-	apt-get install locales-all
+	apt-get install locales-all apt dpkg
 
 rest follows
 
 	apt-get dist-upgrade
 
+use dash as system shell (/bin/sh).
 
 reject changes to /etc/pam.d/sudo (puppet will install a new file later anyway)
 
@@ -65,15 +78,42 @@ update dsa-puppet.git (add to squeeze list in local.yaml)
 
 do a puppet run:
 
-	puppetd -t
+	puppetd -t; puppetd -t
 
 upgrade once more (security etc)
 
 	apt-get update && apt-get dist-upgrade
 
-check for obsolete packages
+if you are moving from a dsa kernel to a debian kernel, add non-free to sources list, then
 
-	/usr/lib/nagios/plugins/dsa-check-packages
+	apt-get install firmware-linux
+
+maybe also
+
+	apt-get install firmware-bnx2
+
+if you are an nfs client, make sure to load the module before boot completes:
+
+	echo nfs >> /etc/modules
+
+if you are an autofs node, make sure to load the module before boot completes:
+
+	echo autofs4 >> /etc/modules
+
+These last two are because autofs in particular lazy loads the modules, and it
+will happen after we've disabled module loading.
+
+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
+
+	(reboot)
+	upgrade-from-grub-legacy
+	(reboot)
+	apt-get purge grub &&
+	apt-get install grub-pc
 
 clean up old libs
 
@@ -82,6 +122,11 @@ clean up old libs
 	orphaner -a
 	orphaner -a -n
 
+check for unneeded/obsolete packages
+
+	apt-get autoremove
+
+	/usr/lib/nagios/plugins/dsa-check-packages
 
 purge removed packages
 
@@ -89,24 +134,20 @@ purge removed packages
 	echo "really purge these [y/N]?" && read ans && [ "$ans" = "y" ] && dpkg --purge `dpkg --get-selections | awk '$2=="deinstall" {print $1}'` &&
 	echo "These are not at install:" && dpkg --get-selections | awk '$2!="install" {print $1}'
 
-re-init samhain
+purge cruft that upgrade doesn't remove
 
-possibly reboot
+	apt-get remove --purge emacs22-common libxmlrpc-ruby libcap1 emacs22-nox emacs22-bin-common libvolume-id0 gcc-4.2-base ifenslave libopenssl-ruby1.8
 
-maybe do:
+re-init samhain
 
-	upgrade-from-grub-legacy
-	apt-get purge grub
-	apt-get install grub-pc
-	apt-get purge dhcp3-client
-	apt-get install isc-dhcp-client
+possibly reboot
 
 re-enable exim, samhain
 
 	mv /etc/rc2.d/K02exim4 /etc/rc2.d/S02exim4
 	mv /etc/rc2.d/K02samhain /etc/rc2.d/S02samhain
 	env -i /etc/init.d/exim4 start
-	env -i /etc/init.d/samhain
+	env -i /etc/init.d/samhain start
 
 	insserv