From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 19 May 2013 14:52:36 +0000 (+0200)
Subject: move comments further up
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=commitdiff_plain;h=9c46e70ce10c760a91380e2afa4698f63a5fcdaf

move comments further up
---

diff --git a/input/howto/upgrade-to-wheezy.mdwn b/input/howto/upgrade-to-wheezy.mdwn
index b43d169..a2b56c8 100644
--- a/input/howto/upgrade-to-wheezy.mdwn
+++ b/input/howto/upgrade-to-wheezy.mdwn
@@ -15,6 +15,11 @@ on buildds:
 
 upgrade stuff:
 
+* answer question to libc6 "Restart services automaticaly" with "yes"
+* answer "Yes" to changes of /etc/default/rcS, [BR#694928](http://bugs.debian.org/694928)
+* and change "FSCKFIX=yes" afterwards, at least on hardware without remote access (like arm*)
+* say no to other other questions.
+
 	sed -i "s#squeeze#wheezy#g" /etc/apt/sources.list.d/debian.list /etc/apt/sources.list.d/security.list &&
 	apt-get update &&
 	apt-get install dpkg apt samhain &&
@@ -25,32 +30,23 @@ upgrade stuff:
 	(puppet agent -t || true) &&
 	apt-get dist-upgrade &&
 	c_rehash /etc/ssl/debian/certs &&
-	apt-get --purge autoremove
+	apt-get --purge autoremove &&
+	while [ "$(deborphan -n | wc -l)" -gt 0 ] ; do apt-get purge $(deborphan -n); done &&
+	apt-get purge liblzma2 lzma
 
-answer question to libc6 "Restart services automaticaly" with "yes"
-answer "Yes" to changes of /etc/default/rcS, [BR#694928](http://bugs.debian.org/694928)
-and change "FSCKFIX=yes" afterwards, at least on hardware without remote access (like arm*)
-say no to other other questions.
 
 if /etc/apache2/apache2.conf was not changed, remove the include for httpd.conf.
 
-clean ups:
-
-	orphaner --purge -n
-
-	apt-get purge liblzma2 lzma libept1
-
-	/usr/lib/nagios/plugins/dsa-check-packages | tr -d ,
-
-	apt-get --purge autoremove
-
-
 purge removed packages
-
 	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}'
 
+more clean ups:
+
+	/usr/lib/nagios/plugins/dsa-check-packages | tr -d ,
+	apt-get --purge autoremove
+
 update dsa-nagios.git (add host to wheezy hostgroup)
 
 re-init samhain