debian/apt.auto-removal.sh: merge the remaining bits

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

diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh
index 8b0f1cf69d5e12f51cffc78fcdb91d641af20df9..4ada56556cca2b9cc3e042e0fa5a1cc529f07b21 100644 (file)
--- a/debian/apt.auto-removal.sh
+++ b/debian/apt.auto-removal.sh
@@ -22,7 +22,6 @@ set -e
 # will overwrite the db when it exits.
 
 
 # will overwrite the db when it exits.
 
 

-# 

 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 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


@@ -43,7 +42,7 @@ version_test_gt ()
        return "$?"
 }
 
        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/ { print $2 }' | sed -e's/linux-image-//')

 
 latest_version=""
 previous_version=""
 
 latest_version=""
 previous_version=""


@@ -74,7 +73,7 @@ EOF
 )
 
 cat > "$config_file".dpkg-new <<EOF
 )
 
 cat > "$config_file".dpkg-new <<EOF

-# File autogenerated by $0, do not edit
+// File autogenerated by $0, do not edit

 APT
 {
   NeverAutoRemove
 APT
 {
   NeverAutoRemove


@@ -85,6 +84,7 @@ for kernel in $kernels; do
        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-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
   };
 done
 cat >> "$config_file".dpkg-new <<EOF
   };