diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.auto-removal.sh | 16 | ||||
| -rw-r--r-- | debian/apt.conf.autoremove | 8 |
2 files changed, 9 insertions, 15 deletions
diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 9c4a4157d..ab8201898 100644 --- 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> @@ -42,7 +41,7 @@ version_test_gt () return "$?" } -list=$(${DPKG} -l 'linux-image-[0-9]*'|awk '/^ii/ && $2 !~ /-dbg$/ { 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="" @@ -74,21 +73,16 @@ EOF generateconfig() { cat <<EOF -// File autogenerated by $0, do not edit -APT +// DO NOT EDIT! File autogenerated by $0 +APT::NeverAutoRemove { - NeverAutoRemove - { EOF apt-config dump --no-empty --format '%v%n' 'APT::VersionedKernelPackages' | while read package; do for kernel in $kernels; do - echo " \"^${package}-${kernel}$\";" + echo " \"^${package}-${kernel}$\";" done done - cat <<EOF - }; -}; -EOF + echo '};' } generateconfig > "${config_file}.dpkg-new" mv "${config_file}.dpkg-new" "$config_file" diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index ea68f88fc..5b958c716 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -4,18 +4,18 @@ APT { "^firmware-linux.*"; "^linux-firmware$"; - "^kfreebsd-image.*"; - "^gnumach$"; - "^gnumach-image.*"; }; VersionedKernelPackages { "linux-image"; + "linux-headers"; "linux-image-extra"; "linux-signed-image"; "linux-backports-modules-.*"; - "linux-headers"; + "kfreebsd-image"; + "kfreebsd-headers"; + "gnumach-image"; }; Never-MarkAuto-Sections |