X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/bac1fd143d91e1595ef412195f44cfedae42b472..fb83d0ccdda584a5aa9a93d87c6c71a03bc24ed4:/debian/apt.auto-removal.sh

diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh
index 598aee1a3..d105f440a 100644
--- a/debian/apt.auto-removal.sh
+++ b/debian/apt.auto-removal.sh
@@ -21,7 +21,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)"
@@ -32,11 +38,11 @@ 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 'linux-image-[0-9]*'|awk '/^ii/ && $2 !~ /-dbg$/ { print $2 }' | sed -e's/linux-image-//')
 
 latest_version=""
 previous_version=""
@@ -67,16 +73,18 @@ EOF
 )
 
 cat > "$config_file".dpkg-new <<EOF
-# File autogenerated by $0, do not edit
+// File autogenerated by $0, do not edit
 APT
 {
   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
+	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
+	echo "    \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new
+	echo "    \"^linux-headers-${kernel}$\";" >> "$config_file".dpkg-new
 done
 cat >> "$config_file".dpkg-new <<EOF
   };