Merge pull request #13 from tastytea/programmer_change

Small fix
increase_version 0.9.11
Teldra 2019-03-26 11:09:50 +01:00 committed by GitHub
commit 004ff12954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -67,7 +67,7 @@ write_hashes ()
fi fi
if [ $((${CKMODES} & 100)) -ne 0 ]; then if [ $((${CKMODES} & 100)) -ne 0 ]; then
#read bios to file #read bios to file
flashrom --programmer $PROGRAMMER -r ${BIOS_TMP} > /dev/null 2>&1 flashrom --programmer ${PROGRAMMER} -r ${BIOS_TMP} > /dev/null 2>&1
#and write hashes of bios files to ${1} #and write hashes of bios files to ${1}
${HASHER} ${BIOS_TMP} >> ${1} ${HASHER} ${BIOS_TMP} >> ${1}
@ -149,7 +149,7 @@ else
echo "You need to have flashrom installed!" echo "You need to have flashrom installed!"
echo "Currently it is not installed, don't reboot" echo "Currently it is not installed, don't reboot"
echo "If you need another programmer than internal" echo "If you need another programmer than internal"
echo "use the variable \$PROGRAMMER in $CONFIG_FILE\!" echo "use the variable PROGRAMMER in $CONFIG_FILE\!"
fi fi
fi fi
@ -249,7 +249,7 @@ then
fi fi
fi fi
if [ $((${CKMODES} & 100)) -ne 0 ]; then if [ $((${CKMODES} & 100)) -ne 0 ]; then
flashrom --programmer $PROGRAMMER -r ${BIOS_TMP} > /dev/null 2>&1 flashrom --programmer ${PROGRAMMER} -r ${BIOS_TMP} > /dev/null 2>&1
#if we set an programmer chip in config, find line with hash for bios and compare. if smthg wrong, panic #if we set an programmer chip in config, find line with hash for bios and compare. if smthg wrong, panic
grep ${BIOS_TMP} ${DIGEST_FILE} | ${HASHER} --check --warn --quiet --strict | tee -a ${LOG_FILE} grep ${BIOS_TMP} ${DIGEST_FILE} | ${HASHER} --check --warn --quiet --strict | tee -a ${LOG_FILE}
if [ ${PIPESTATUS[2]} -ne 0 ] if [ ${PIPESTATUS[2]} -ne 0 ]