From 838ffa831dca80e5578df0de9d6ac67d903c58c7 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 19 Feb 2012 21:07:08 -0500 Subject: lsinitcpio: detect kver separate from modules mkinitcpio will always create /lib/modules/$kernver/kernel in the image, so we can use this to detect the kernel the image was built for, even if the image contains no modules. Signed-off-by: Dave Reisner --- lsinitcpio | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lsinitcpio b/lsinitcpio index 37d2764..0fc8c67 100755 --- a/lsinitcpio +++ b/lsinitcpio @@ -98,13 +98,11 @@ if (( analyze )); then # read contents of image while read -r line; do - if [[ $line = *.ko?(.gz) ]]; then # module - if [[ -z $kernver ]]; then - [[ $line =~ /lib/modules/([^/]+)/ ]] && kernver=${BASH_REMATCH[1]} - fi + if [[ $line = *.ko?(.?z) ]]; then line=${line##*/} - modules+=("${line%.ko?(.gz)}") - continue + modules+=("${line%.ko?(.?z)}") + elif [[ -z $kernver && $line =~ /lib/modules/([^/]+)/ ]]; then + kernver=${BASH_REMATCH[1]} elif [[ $line = ./hooks/* ]]; then foundhooks+=("${line##*/}") elif [[ $line = *@(/bin/|/sbin/)* ]]; then -- cgit v1.2.3-24-g4f1b