[fix] fix osk-sdl extra verbosity

This commit is contained in:
Alex 2021-04-12 17:17:37 +02:00
parent 89b86f4384
commit ddd7243f45

View file

@ -72,7 +72,7 @@ fallback() {
fi fi
else else
if [ $osk_sdl = 1 ] ; then 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." || panic "Failure running osk-sdl. Good luck."
else else
echo </dev/console 2>/dev/console echo </dev/console 2>/dev/console
@ -122,7 +122,7 @@ if [ $plymouth = 1 ] ; then
# Get pin number from osk_sdl # Get pin number from osk_sdl
plymouth hide-splash 2>/dev/null plymouth hide-splash 2>/dev/null
${DECIPHER_COMMAND} $DECIPHER_ARGS "$KEY" $DECIPHER_EXTRA_ARGS \ ${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 plymouth show-splash 2>/dev/null
else else
# Get pin number from plymouth # Get pin number from plymouth
@ -133,7 +133,7 @@ else
if [ $osk_sdl = 1 ] ; then if [ $osk_sdl = 1 ] ; then
# Get pin number from osk_sdl # Get pin number from osk_sdl
${DECIPHER_COMMAND} $DECIPHER_ARGS "$KEY" $DECIPHER_EXTRA_ARGS \ ${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 else
# Get pin number from console # Get pin number from console
${DECIPHER_COMMAND} $DECIPHER_ARGS "$KEY" $DECIPHER_EXTRA_ARGS </dev/console 2>/dev/console ${DECIPHER_COMMAND} $DECIPHER_ARGS "$KEY" $DECIPHER_EXTRA_ARGS </dev/console 2>/dev/console