newline

[mirror/dsa-wiki.git] / input / howto / upgrade-to-squeeze.mdwn

diff --git a/input/howto/upgrade-to-squeeze.mdwn b/input/howto/upgrade-to-squeeze.mdwn
index eb36eef..8e6ffaa 100644 (file)
--- a/input/howto/upgrade-to-squeeze.mdwn
+++ b/input/howto/upgrade-to-squeeze.mdwn
@@ -3,7 +3,8 @@
 
 turn off samhain
 
-       /etc/init.d/samhain stop
+       /etc/init.d/samhain stop &&
+       mv /etc/rc2.d/S19samhain /etc/rc2.d/K19samhain # and stay down
 
 
 maybe turn off exim
@@ -23,8 +24,8 @@ install deborphan, clean up
 
 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}'`
+       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:
@@ -70,10 +71,6 @@ upgrade once more (security etc)
 
        apt-get update && apt-get dist-upgrade
 
-rest follows
-
-       apt-get dist-upgrade
-
 check for obsolete packages
 
        /usr/lib/nagios/plugins/dsa-check-packages
@@ -88,16 +85,32 @@ clean up old libs
 
 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}'`
+       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}'
 
+re-init samhain
+
 possibly reboot
 
-re-enable exim
+maybe do:
 
-       mv /etc/rc2.d/K20exim4 /etc/rc2.d/S20exim4
+       upgrade-from-grub-legacy
+       apt-get purge grub
+       apt-get install grub-pc
+       apt-get purge dhcp3-client
+       apt-get install isc-dhcp-client
+
+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
+
+       insserv
+
+re-init samhain
 
 
 ### Problems with CCISS