oem-factory-reset: fix output when fbwhiptail is not used

- Fixed inversed HEIGHT and WIDTH usage
- Fixed height to 30 and width to 90 as everywhere else

This was causing a blank screen when whiptail without framebuffer (fbwhiptail) was used.
Actually, it seems like the width and height under whiptail calls are only taken into consideration under NEWT, not FBWHIPTAIL.
This commit is contained in:
Thierry Laurion 2021-10-29 13:35:16 -04:00 committed by tlaurion
parent 661b3b0e81
commit 2fc8813fc6

View File

@ -12,8 +12,8 @@ export TOP_PID=$$
CLEAR="--clear"
CONTINUE="--yes-button Continue"
CANCEL="--no-button Cancel"
HEIGHT="150"
WIDTH="220"
HEIGHT="30"
WIDTH="90"
USER_PIN_DEF=123456
ADMIN_PIN_DEF=12345678
@ -289,7 +289,7 @@ $TPM_STR
* Sign all of the files in /boot with the new GPG key\n\n
It requires that you already have an OS installed on a\n
dedicated /boot partition. Do you wish to continue?\n" \
$WIDTH $HEIGHT $CONTINUE $CANCEL $CLEAR $bg_color --title "$title_text" ; then
$HEIGHT $WIDTH $CONTINUE $CANCEL $CLEAR $bg_color --title "$title_text" ; then
exit 1
fi