From fa78f20fc86dabbd6e89485b755cb40f3918895a Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Sun, 27 May 2007 00:57:02 +0200 Subject: hook-functions: make version check in check_minkver more robust. --- hook-functions | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'hook-functions') diff --git a/hook-functions b/hook-functions index b3264ac..1b38931 100644 --- a/hook-functions +++ b/hook-functions @@ -340,9 +340,13 @@ check_minkver() fi set_initlist for cm_x in ${initlist}; do - tmp=$(eval echo $(grep ^MINKVER ${initdir}/${cm_x} | cut -d'=' -f2)) - if dpkg --compare-versions "${curversion}" lt "${tmp}"; then - echo "W: ${cm_x} hook script requires at least kernel version ${tmp}" >&2 + # sed: keep last line starting with MINKVER=, + # remove MINKVER= and trailing space + minver=$(sed '/^MINKVER=/!d;$!d;s/^MINKVER=//;s/[[:space:]]*$//' "${initdir}/${cm_x}") + if [ -z "${tmp}" ]; then + continue + elif dpkg --compare-versions "${curversion}" lt "${minver}"; then + echo "W: ${cm_x} hook script requires at least kernel version ${minver}" >&2 echo "W: not generating requested initramfs for kernel ${curversion}" >&2 exit 2 fi -- cgit v1.2.3