refactor key removal code to reuse it in next step

[apt.git] / debian / apt.auto-removal.sh

diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh
index 8f6fc2efcf522d99aa73e38c352e215d669a4544..c00416127a26e27f9e413dc24f895627937ecdab 100644 (file)
--- a/debian/apt.auto-removal.sh
+++ b/debian/apt.auto-removal.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 set -e
 
 # Author: Steve Langasek <steve.langasek@canonical.com>
@@ -9,6 +8,10 @@ set -e
 #  - the kernel version we've been called for
 #  - the latest kernel version (determined using rules copied from the grub
 #    package for deciding which kernel to boot)
+#  - the second-latest kernel version, if the booted kernel version is
+#    already the latest and this script is called for that same version,
+#    to ensure a fallback remains available in the event the newly-installed
+#    kernel at this ABI fails to boot
 # In the common case, this results in exactly two kernels saved, but it can
 # result in three kernels being saved.  It's better to err on the side of
 # saving too many kernels than saving too few.
@@ -17,7 +20,13 @@ set -e
 # packages in the database because this runs from a postinst script, and apt
 # will overwrite the db when it exits.
 
-config_file=/etc/apt/apt.conf.d/01autoremove-kernels
+
+eval $(apt-config shell APT_CONF_D Dir::Etc::parts/d)
+test -n "${APT_CONF_D}" || APT_CONF_D="/etc/apt/apt.conf.d"
+config_file=${APT_CONF_D}/01autoremove-kernels
+
+eval $(apt-config shell DPKG Dir::bin::dpkg/f)
+test -n "$DPKG" || DPKG="/usr/bin/dpkg"
 
 installed_version="$1"
 running_version="$(uname -r)"
@@ -28,40 +37,49 @@ version_test_gt ()
        local version_test_gt_sedexp="s/[._-]\(pre\|rc\|test\|git\|old\|trunk\)/~\1/g"
        local version_a="`echo "$1" | sed -e "$version_test_gt_sedexp"`"
        local version_b="`echo "$2" | sed -e "$version_test_gt_sedexp"`"
-       dpkg --compare-versions "$version_a" gt "$version_b"
+       $DPKG --compare-versions "$version_a" gt "$version_b"
        return "$?"
 }
 
-list=$(dpkg -l 'linux-image-[0-9]*'|awk '/^ii/ { print $2 }' | sed -e's/linux-image-//')
+list="$(${DPKG} -l | awk '/^ii[ ]+(linux|kfreebsd|gnumach)-image-[0-9]/ && $2 !~ /-dbg$/ { print $2 }' | sed -e 's#\(linux\|kfreebsd\|gnumach\)-image-##')"
 
 latest_version=""
+previous_version=""
 for i in $list; do
        if version_test_gt "$i" "$latest_version"; then
+               previous_version="$latest_version"
                latest_version="$i"
+       elif version_test_gt "$i" "$previous_version"; then
+               previous_version="$i"
        fi
 done
 
-kernels=$(sort -u <<EOF
-$latest_version
+if [ "$latest_version" != "$installed_version" ] \
+   || [ "$latest_version" != "$running_version" ] \
+   || [ "$installed_version" != "$running_version" ]
+then
+       # We have at least two kernels that we have reason to think the
+       # user wants, so don't save the second-newest version.
+       previous_version=
+fi
+
+kernels="$(echo "$latest_version
 $installed_version
 $running_version
-EOF
-)
+$previous_version" | sort -u | sed -e 's#\.#\\.#g' )"
 
-cat > "$config_file".dpkg-new <<EOF
-# File autogenerated by $0, do not edit
-APT
+generateconfig() {
+       cat <<EOF
+// DO NOT EDIT! File autogenerated by $0
+APT::NeverAutoRemove
 {
-  NeverAutoRemove
-  {
-EOF
-for kernel in $kernels; do
-       echo "    \"^linux-image-$kernel.*\";" >> "$config_file".dpkg-new
-       echo "    \"^linux-image-extra-$kernel.*\";" >> "$config_file".dpkg-new
-       echo "    \"^linux-signed-image-$kernel.*\";" >> "$config_file".dpkg-new
-done
-cat >> "$config_file".dpkg-new <<EOF
-  };
-};
 EOF
-mv "$config_file".dpkg-new "$config_file"
+       apt-config dump --no-empty --format '%v%n' 'APT::VersionedKernelPackages' | while read package; do
+               for kernel in $kernels; do
+                       echo "   \"^${package}-${kernel}$\";"
+               done
+       done
+       echo '};'
+}
+generateconfig > "${config_file}.dpkg-new"
+mv "${config_file}.dpkg-new" "$config_file"