ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-03-12 07:23:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oem-factory-reset: fix GPG key backup filename

Browse Source 
fix $GPG_GEN_KEY getting clobbered when using a custom password

Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
This commit is contained in:
Matt DeVillier 2020-02-19 14:15:27 -06:00
parent c684d6b37c
commit 83a67d2798
No known key found for this signature in database
GPG Key ID: 2BBB776A35B978FD
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
initrd/bin/oem-factory-reset
View File

@ -316,6 +316,10 @@ gpg --list-keys >/dev/null 2>&1
echo -e "\nResetting GPG Key...\n(this will take a minute or two)\n" echo -e "\nResetting GPG Key...\n(this will take a minute or two)\n"
gpg_key_reset gpg_key_reset
# parse name of generated key
GPG_GEN_KEY=`grep -A1 pub /tmp/gpg_card_edit_output | tail -n1 | sed -nr 's/^([ ])*//p'`
PUBKEY="/tmp/${GPG_GEN_KEY}.asc"
if [ "$CUSTOM_PASS" != "" ]; then if [ "$CUSTOM_PASS" != "" ]; then
echo -e "\nChanging default GPG Admin PIN\n" echo -e "\nChanging default GPG Admin PIN\n"
gpg_key_change_pin "3" "$ADMIN_PIN_DEF" "$CUSTOM_PASS" gpg_key_change_pin "3" "$ADMIN_PIN_DEF" "$CUSTOM_PASS"
@ -327,9 +331,6 @@ fi
## export generated key to USB ## export generated key to USB
echo -e "\nExporting generated key to USB...\n" echo -e "\nExporting generated key to USB...\n"
# parse name of generated key
GPG_GEN_KEY=`grep -A1 pub /tmp/gpg_card_edit_output | tail -n1 | sed -nr 's/^([ ])*//p'`
PUBKEY="/tmp/${GPG_GEN_KEY}.asc"
# export pubkey to file # export pubkey to file
if ! gpg --export --armor $GPG_GEN_KEY > "${PUBKEY}" 2>/tmp/error ; then if ! gpg --export --armor $GPG_GEN_KEY > "${PUBKEY}" 2>/tmp/error ; then
ERROR=$(tail -n 1 /tmp/error) ERROR=$(tail -n 1 /tmp/error)