From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 16 Mar 2011 14:05:30 +0000 (+0100)
Subject: reorder and fix
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=f3c7380f29fba6fcfe6fa5bcafd6fe1110fc4c3c

reorder and fix
---

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index 7699dfd..ef8a397 100644
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -8,7 +8,7 @@ turn off samhain
 
 maybe turn off exim
 
-	/etc/init.d/exim4 stop
+	/etc/init.d/exim4 stop &&
 	mv /etc/rc2.d/S20exim4 /etc/rc2.d/K20exim4 # so it stays down
 
 
@@ -23,37 +23,22 @@ install deborphan, clean up
 
 purge removed packages
 
-	dpkg --get-selections | awk '$2!="install" {print $1}'
-	echo "really purge these [y/N]?"; read ans; [ "$ans" = "y" ] && dpkg --purge `dpkg --get-selections | awk '$2!="install" {print $1}'`
-
-update dsa-puppet.git (add to squeeze list in local.yaml)
-
-do a puppet run:
-
-	puppetd -t
-
+	dpkg --get-selections | awk '$2=="deinstall" {print $1}'
+	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}'
 
 change sources list entries to squeeze:
 
-	mirror=`cat /etc/apt/sources.list.d/debian.list | awk '/debian/ {print $2; exit}'`
-	echo "Mirror is $mirror"; echo "Fix stuff if this seems wrong"; echo "XXXXXXXXXXXXXXXXXXXXXXX"
-	echo "## VERIFY THE MIRROR IS CORRECT ##"; read
-
-
-write new sources.list.d/ entries:
-
-	cd /etc/apt/sources.list.d && sed -i "s#lenny#squeeze#g" > debian.list
+	cd /etc/apt/sources.list.d && sed -i "s#lenny#squeeze#g" debian.list
 
 update apt list
 
 	apt-get update
 
-
 upgrade
 
 	apt-get install locales-all
 
-
 rest follows
 
 	apt-get dist-upgrade
@@ -75,6 +60,13 @@ reject changes to /etc/munin/plugin-conf.d/munin-node (puppet will install a new
 
 update nagios.git (add host to squeeze hostgroup)
 
+update dsa-puppet.git (add to squeeze list in local.yaml)
+
+do a puppet run:
+
+	puppetd -t
+
+
 check for obsolete packages
 
 	/usr/lib/nagios/plugins/dsa-check-packages