commit: b020169858590fb291003c86c8ddfc4194d9ca19
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 17:13:22 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 21 16:26:39 2021 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b0201698
linuxrc: Use same $CRYPT_SILENT style
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
defaults/linuxrc | 2 +-
defaults/login-remote.sh | 8 ++++----
defaults/unlock-luks.sh | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index dc34439..2bb4bae 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1045,7 +1045,7 @@ then
then
CRYPT_ROOT_KEY="$(head -n 1 "${CDROOT_PATH}"/${CDROOT_MARKER})"
CRYPT_ROOT='/dev/loop0'
- good_msg 'You booted an encrypted livecd' "${CRYPT_SILENT}"
+ good_msg 'You booted an encrypted livecd' ${CRYPT_SILENT}
losetup /dev/loop0 "${CDROOT_PATH}/${LOOPEXT}${LOOP}"
test_success 'Preparing loop filesystem'
diff --git a/defaults/login-remote.sh b/defaults/login-remote.sh
index 7fcfc70..8eee09a 100644
--- a/defaults/login-remote.sh
+++ b/defaults/login-remote.sh
@@ -30,11 +30,11 @@ receivefile() {
file=${CRYPT_SWAP_KEYFILE}
;;
'')
- bad_msg "No keyfile specified." "${CRYPT_SILENT}"
+ bad_msg "No keyfile specified." ${CRYPT_SILENT}
exit 1
;;
*)
- bad_msg "Unknown '${1}' keyfile received."
"${CRYPT_SILENT}"
+ bad_msg "Unknown '${1}' keyfile received."
${CRYPT_SILENT}
exit 1
;;
esac
@@ -67,12 +67,12 @@ then
exit 1
fi
else
- bad_msg "Keyfile was not properly received!"
"${CRYPT_SILENT}"
+ bad_msg "Keyfile was not properly received!"
${CRYPT_SILENT}
exit 1
fi
;;
*)
- bad_msg "Command '${command}' is not supported!"
"${CRYPT_SILENT}"
+ bad_msg "Command '${command}' is not supported!"
${CRYPT_SILENT}
exit 1
esac
else
diff --git a/defaults/unlock-luks.sh b/defaults/unlock-luks.sh
index 9ef54e0..2674d93 100644
--- a/defaults/unlock-luks.sh
+++ b/defaults/unlock-luks.sh
@@ -74,7 +74,7 @@ main() {
if ! run cryptsetup isLuks "${LUKS_DEVICE}"
then
- bad_msg "The LUKS device ${LUKS_DEVICE} does
not contain a LUKS header" "${CRYPT_SILENT}"
+ bad_msg "The LUKS device ${LUKS_DEVICE} does
not contain a LUKS header" ${CRYPT_SILENT}
# User has SSH access and is able to call
script again or
# able to investigate the problem on its own.
@@ -103,10 +103,10 @@ main() {
if [ ${crypt_filter_ret} -eq 0 ]
then
run touch "${OPENED_LOCKFILE}"
- good_msg "LUKS device ${LUKS_DEVICE}
opened" "${CRYPT_SILENT}"
+ good_msg "LUKS device ${LUKS_DEVICE}
opened" ${CRYPT_SILENT}
break
else
- bad_msg "Failed to open LUKS device
${LUKS_DEVICE}" "${CRYPT_SILENT}"
+ bad_msg "Failed to open LUKS device
${LUKS_DEVICE}" ${CRYPT_SILENT}
# We need to stop here with a non-zero
exit code to prevent
# a loop when invalid keyfile was sent.
