Remove backports again when puppet resets our sources back to stretch

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

diff --git a/input/howto/upgrade-to-buster.mdwn b/input/howto/upgrade-to-buster.mdwn
index 6424a99..ee5303a 100644 (file)
--- a/input/howto/upgrade-to-buster.mdwn
+++ b/input/howto/upgrade-to-buster.mdwn
@@ -10,6 +10,7 @@ upgrade stuff:
 * say no to other other questions.
 
 first re-enable module loading, as new modules are needed to restart ferm (due to nftables):
+
        sed -i "s#echo 1#echo 0#" /etc/rc.local &&
        reboot < /dev/null
 
@@ -21,7 +22,7 @@ commands:
        apt-get update &&
        service samhain stop &&
        rm -f /var/state/samhain/samhain_file /var/lib/samhain/samhain_file &&
-       apt-get install dpkg apt samhain linux-image-amd64 &&
+       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 &&
@@ -29,6 +30,7 @@ commands:
        (puppet agent -t || true) &&
        : sometimes puppet resets our sources back to stretch.  insist &&
        sed -i "s#stretch#buster#g" /etc/apt/sources.list.d/debian.list /etc/apt/sources.list.d/security.list &&
+       sed -i "/backports/d" /etc/apt/sources.list.d/debian.list &&
        apt-get update &&
        apt-get dist-upgrade &&
        apt-get --purge autoremove &&
@@ -36,10 +38,6 @@ commands:
        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}' &&