diff --git a/modules.d/03modsign/module-setup.sh b/modules.d/03modsign/module-setup.sh index 8831ad54..730cd86e 100644 --- a/modules.d/03modsign/module-setup.sh +++ b/modules.d/03modsign/module-setup.sh @@ -8,7 +8,15 @@ # Peter Jones check() { - [ -x /usr/bin/keyctl ] || return 1 + [[ -x /usr/bin/keyctl ]] || return 1 + + # do not include module in hostonly mode, + # if no keys are present + if [[ $hostonly ]]; then + x=$(echo /lib/modules/keys/*) + [[ "${x}" = "/lib/modules/keys/*" ]] && return 255 + fi + return 0 } @@ -20,9 +28,10 @@ install() { inst_dir /lib/modules/keys inst_binary /usr/bin/keyctl - inst_hook initqueue/pre-trigger 01 "$moddir/load-modsign-keys.sh" + inst_hook pre-trigger 01 "$moddir/load-modsign-keys.sh" + for x in /lib/modules/keys/* ; do - [ "${x}" = "/lib/modules/keys/*" ] && break - inst_simple ${x} + [[ "${x}" = "/lib/modules/keys/*" ]] && break + inst_simple "${x}" done }