From ddd7243f45b9afca0cb575fcb2682b88977aff60 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 12 Apr 2021 17:17:37 +0200 Subject: [PATCH] [fix] fix osk-sdl extra verbosity --- lib/cryptsetup/scripts/decrypt_pkcs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/cryptsetup/scripts/decrypt_pkcs b/lib/cryptsetup/scripts/decrypt_pkcs index 74fbad3..f035bac 100755 --- a/lib/cryptsetup/scripts/decrypt_pkcs +++ b/lib/cryptsetup/scripts/decrypt_pkcs @@ -72,7 +72,7 @@ fallback() { fi else if [ $osk_sdl = 1 ] ; then - /usr/bin/osk-sdl -d ${CRYPTTAB_SOURCE} -n "${CRYPTTAB_NAME}" -c /etc/osk.conf -v \ + /usr/bin/osk-sdl -d ${CRYPTTAB_SOURCE} -n "${CRYPTTAB_NAME}" -c /etc/osk.conf \ || panic "Failure running osk-sdl. Good luck." else echo /dev/console @@ -122,7 +122,7 @@ if [ $plymouth = 1 ] ; then # Get pin number from osk_sdl plymouth hide-splash 2>/dev/null ${DECIPHER_COMMAND} $DECIPHER_ARGS "$KEY" $DECIPHER_EXTRA_ARGS \ - $DECIPHER_ASK_PIN "$(/usr/bin/osk-sdl -v -k -d "${CRYPTTAB_SOURCE}" -n "${CRYPTTAB_NAME}" -c /etc/osk.conf)" + $DECIPHER_ASK_PIN "$(/usr/bin/osk-sdl -k -d "${CRYPTTAB_SOURCE}" -n "${CRYPTTAB_NAME}" -c /etc/osk.conf 2> /dev/null | tail -n1)" plymouth show-splash 2>/dev/null else # Get pin number from plymouth @@ -133,7 +133,7 @@ else if [ $osk_sdl = 1 ] ; then # Get pin number from osk_sdl ${DECIPHER_COMMAND} $DECIPHER_ARGS "$KEY" $DECIPHER_EXTRA_ARGS \ - $DECIPHER_ASK_PIN "$(/usr/bin/osk-sdl -v -k -d "${CRYPTTAB_SOURCE}" -n "${CRYPTTAB_NAME}" -c /etc/osk.conf)" + $DECIPHER_ASK_PIN "$(/usr/bin/osk-sdl -k -d "${CRYPTTAB_SOURCE}" -n "${CRYPTTAB_NAME}" -c /etc/osk.conf 2> /dev/null | tail -n1)" else # Get pin number from console ${DECIPHER_COMMAND} $DECIPHER_ARGS "$KEY" $DECIPHER_EXTRA_ARGS /dev/console