X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-wiki.git;a=blobdiff_plain;f=input%2Fhowto%2Fupgrade-to-stretch.mdwn;h=a8b4bc3e70287fed8835aa9dc42bd6352ae16588;hp=c1627e515c2f78ad543d32dd1342f971b2fac8ae;hb=b0ba1ec4ec05f57630d96747e15cc510e27258e8;hpb=32d72e9b27ec68a046a9235f6ec2d734ce221595

diff --git a/input/howto/upgrade-to-stretch.mdwn b/input/howto/upgrade-to-stretch.mdwn
index c1627e5..a8b4bc3 100644
--- a/input/howto/upgrade-to-stretch.mdwn
+++ b/input/howto/upgrade-to-stretch.mdwn
@@ -9,9 +9,6 @@ upgrade stuff:
 * answer question to libc6 "Restart services automaticaly" with "yes"
 * say no to other other questions.
 
-todo:
-  at least on lindsay samhain failed to configure after upgrading the package.  figure out details.
-
 commands:
 
 	sed -i "s#jessie#stretch#g" /etc/apt/sources.list.d/debian.list /etc/apt/sources.list.d/security.list &&
@@ -21,20 +18,29 @@ commands:
 	fi &&
 	apt-get update &&
 	service samhain stop &&
-	apt-get install dpkg apt samhain &&
+	rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file &&
+	apt-get install dpkg apt samhain linux-image-amd64 &&
 	service samhain stop &&
 	apt-get dist-upgrade &&
 	rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file &&
 	samhain --foreground -t init -p none -s none -l none -m none &&
 	(puppet agent -t || true) &&
+	: sometimes puppet resets our sources back to jessie.  insist &&
+	sed -i "s#jessie#stretch#g" /etc/apt/sources.list.d/debian.list /etc/apt/sources.list.d/security.list &&
 	apt-get update &&
 	apt-get dist-upgrade &&
-	apt-get purge libssl1.0.0:amd64 gcc-4.9-base:amd64 gcc-4.8-base:amd64 libapt-pkg4.12:amd64 libreadline6:amd64  libprocps3:amd64 sp libsp1c2 libaugeas-ruby1.8 &&
+	: Only try to purge packages that are installed, else apt gets angry &&
+	apt-get purge $(for i in libssl1.0.0:amd64 gcc-4.9-base:amd64 gcc-4.8-base:amd64 libapt-pkg4.12:amd64 libreadline6:amd64  libprocps3:amd64 sp libsp1c2 libaugeas-ruby1.8 libreadline6:arm64 gcc-4.9-base:arm64 gcc-4.8-base:arm64 libruby2.1:arm64 ruby2.1 libssl1.0.0:arm64 libaugeas-ruby sysvinit; do dpkg -l "$i" 2>/dev/null | grep -q '^ii' && echo "$i"; done) &&
+	(puppet agent -t || true) &&
 	apt-get --purge autoremove &&
 	while [ "$(deborphan -n | wc -l)" -gt 0 ] ; do apt-get purge $(deborphan -n); done &&
 	dpkg --clear-avail &&
 	apt-get clean
 
+on amd64, install kernel:
+
+	apt-get install linux-image-amd64
+
 purge removed packages
 
 	dpkg --get-selections | awk '$2=="deinstall" {print $1}' &&
@@ -52,6 +58,8 @@ more clean ups:
 
 	(puppet agent -t || true) && (puppet agent -t || true)
 
+On HP servers, add nopat to GRUB_CMDLINE_LINUX in /etc/default/grub.
+
 On ppc64el (only VMs?) the network interface has been renamed from ethX to ibmvethX. Change /etc/network/interfaces accordingly.
 
 update dsa-nagios.git (add host to stretch hostgroup)
@@ -62,4 +70,13 @@ re-init samhain and finish with a reboot
 	(puppet agent -t || true) &&
 	(puppet agent -t || true) &&
 	samhain --foreground -t update -p none -s none -l none -m none &&
-	/sbin/reboot
+	dsa-update-apt-status -f &&
+	reboot < /dev/null
+
+consider more cleanup
+
+	apt-get autoremove &&
+	(puppet agent -t || true) &&
+	samhain --foreground -t update -p none -s none -l none -m none &&
+	dsa-update-apt-status -f
+