Merge branch 'skip_sig_checks' of https://github.com/kylerankin/heads

This commit is contained in:
Trammell hudson 2018-04-30 16:39:20 -04:00
commit 03a0e39bce
Failed to extract signature
2 changed files with 9 additions and 3 deletions

View File

@ -304,7 +304,11 @@ do_boot()
}
while true; do
check_config $paramsdir
if [ "$force_boot" = "y" ]; then
check_config $paramsdir force
else
check_config $paramsdir
fi
TMP_DEFAULT_FILE=`find /tmp/kexec/kexec_default.*.txt 2>/dev/null | head -1` || true
TMP_MENU_FILE="/tmp/kexec/kexec_menu.txt"
TMP_HASH_FILE="/tmp/kexec/kexec_hashes.txt"

View File

@ -190,8 +190,10 @@ check_config() {
return
fi
if ! sha256sum `find $1/kexec*.txt` | gpgv $1/kexec.sig - ; then
die 'Invalid signature on kexec boot params'
if [ "$2" != "force" ]; then
if ! sha256sum `find $1/kexec*.txt` | gpgv $1/kexec.sig - ; then
die 'Invalid signature on kexec boot params'
fi
fi
echo "+++ Found verified kexec boot params"