From 30154ac2af96c282e8e4397aea0312ceeaf3f896 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 28 Apr 2010 13:31:09 +0200 Subject: [PATCH] Handle cases where a meta package depends on a disjunction of kernel image packages. --- dsa-nagios-checks/checks/dsa-check-running-kernel | 2 +- dsa-nagios-checks/debian/changelog | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dsa-nagios-checks/checks/dsa-check-running-kernel b/dsa-nagios-checks/checks/dsa-check-running-kernel index b386774..0d50b76 100755 --- a/dsa-nagios-checks/checks/dsa-check-running-kernel +++ b/dsa-nagios-checks/checks/dsa-check-running-kernel @@ -89,7 +89,7 @@ get_avail() { local imagename=0 # --no-all-versions show shows only the candidate - for vers in $(apt-cache --no-all-versions show ${prefix}-image-${metavers} | egrep '^Depends:' | awk '{print $2}' | sort -u); do + for vers in $(apt-cache --no-all-versions show ${prefix}-image-${metavers} | sed -n 's/^Depends: //p' | tr ',' '\n' | tr -d ' ' | grep ${prefix}-image | awk '{print $1}' | sort -u); do if dpkg --compare-versions $vers gt $imagename; then imagename=$vers fi diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog index e1975e8..b9f2af9 100644 --- a/dsa-nagios-checks/debian/changelog +++ b/dsa-nagios-checks/debian/changelog @@ -8,9 +8,12 @@ dsa-nagios-checks (8X) Xnstable; urgency=low * Add dsa-check-uptime [ Uli Martens ] - * Teach dsa-check-running-kernel about LZMA compressed kernel images. + * dsa-check-running-kernel: + - Teach dsa-check-running-kernel about LZMA compressed kernel images. + - Handle cases where a meta package depends on a disjunction of kernel + image packages. - -- Peter Palfrader Wed, 28 Apr 2010 10:04:37 +0200 + -- Peter Palfrader Wed, 28 Apr 2010 13:30:51 +0200 dsa-nagios-checks (85) unstable; urgency=low -- 2.20.1