From 6a9fcafea5122e4440acf83797b6da06789ea38f Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 17 Jul 2017 08:41:46 +0200 Subject: [PATCH] update to the upgrade instructions: insist we move to stretch even if puppet does not want to, and only try to purge installed packages --- input/howto/upgrade-to-stretch.mdwn | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/input/howto/upgrade-to-stretch.mdwn b/input/howto/upgrade-to-stretch.mdwn index c1627e5..93e9559 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,15 +18,20 @@ commands: fi && apt-get update && service samhain stop && + rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file && apt-get install dpkg apt samhain && 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; 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 && @@ -62,4 +64,5 @@ 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 && + dsa-update-apt-status -f && /sbin/reboot -- 2.20.1