From 0f3f86d21e98d9159fb65cdc8cfcfe837db4b0ff Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Wed, 6 Apr 2022 17:02:14 -0500 Subject: [PATCH] etc/luks-functions: exit function when select_luks_container() returns non-zero Signed-off-by: Matt DeVillier --- initrd/etc/luks-functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/initrd/etc/luks-functions b/initrd/etc/luks-functions index f581601f..b4d81277 100644 --- a/initrd/etc/luks-functions +++ b/initrd/etc/luks-functions @@ -34,7 +34,7 @@ select_luks_container() test_luks_current_disk_recovery_key_passphrase() { while : ; do - select_luks_container + select_luks_container || return 1 if [ -z "$luks_current_Disk_Recovery_Key_passphrase" ]; then #if no external provisioning provides current Disk Recovery Key passphrase echo -e "\nEnter current Disk Recovery Key passphrase (Provisioned at OS installation or by OEM):" @@ -73,7 +73,7 @@ test_luks_current_disk_recovery_key_passphrase() luks_reencrypt(){ while : ; do - select_luks_container + select_luks_container || return 1 if [ -z "$luks_current_Disk_Recovery_Key_passphrase" ]; then #if no external provisioning provides current Disk Recovery Key passphrase whiptail --title 'Reencrypt LUKS disk encrypted container ?' \ @@ -112,7 +112,7 @@ done luks_change_passphrase() { while : ; do - select_luks_container + select_luks_container || return 1 #if actual or new Disk Recovery Key is not provisioned by oem-provisioning file if [ -z "$luks_current_Disk_Recovery_Key_passphrase" ] || [ -z "$luks_new_Disk_Recovery_Key_passphrase" ] ; then whiptail --title 'Changing LUKS Disk Recovery Key passphrase' --msgbox \