diff --git a/debian/changelog b/debian/changelog index 49b4b5d..a4a0222 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ xen-tools (4.4+dev-1) UNRELEASED; urgency=low Thanks Eric Engstrom! + Fix missing quoting in shell function "assert" in hooks/common.sh. + Fix initial configuration summary in cases where pygrub is used. + + Fix corner cases where not the latest kernel would have been checked. * Bump Standards-Version to 3.9.6 (no changes needed) * Fix lintian warning depends-on-perl-modules. diff --git a/hooks/debian/80-install-kernel b/hooks/debian/80-install-kernel index af56ca8..38b531c 100755 --- a/hooks/debian/80-install-kernel +++ b/hooks/debian/80-install-kernel @@ -94,7 +94,10 @@ else fi fi -DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1)) +# Check for "ls -v" support +V=''; if ls -1 ${prefix}/boot/vmlinuz* > /dev/null 2>&1; then V=-v; fi + +DOMU_KERNEL=$(basename $(ls -1 ${V} ${prefix}/boot/vmlinuz* | tail -n 1)) KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g") DOMU_RAMDISK="initrd.img-$KERNEL_REV" DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue)