diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2021-03-08 01:35:19 +0100 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-03-08 01:36:13 +0100 |
| commit | 3f1a037b36a3df7ba5acb3b91f925df06dbd61da (patch) | |
| tree | 7bffe482096799fb56e76e4751c52500a47f745c /defaults/initrd.scripts | |
| parent | defaults/modules_load: Add netconsole (diff) | |
| download | genkernel-3f1a037b36a3df7ba5acb3b91f925df06dbd61da.tar.gz genkernel-3f1a037b36a3df7ba5acb3b91f925df06dbd61da.tar.bz2 genkernel-3f1a037b36a3df7ba5acb3b91f925df06dbd61da.zip | |
initrd.scripts: Add trim() function
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'defaults/initrd.scripts')
| -rw-r--r-- | defaults/initrd.scripts | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index f7e6c3d..d005e0d 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1103,6 +1103,15 @@ test_success() { fi } +trim() { + local var="$*" + + var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters + var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters + + printf "%s" "${var}" +} + log_msg() { is_log_enabled || return @@ -1779,6 +1788,7 @@ openLUKS() { eval local LUKS_KEYDEV='"${CRYPT_'${TYPE}'_KEYDEV}"' eval local LUKS_KEYDEV_FSTYPE='"${CRYPT_'${TYPE}'_KEYDEV_FSTYPE}"' eval local cryptsetup_options='"${CRYPT_'${TYPE}'_OPTIONS}"' + cryptsetup_options="$(trim "${cryptsetup_options}")" eval local OPENED_LOCKFILE='"${CRYPT_'${TYPE}'_OPENED_LOCKFILE}"' local DEV_ERROR=0 KEY_ERROR=0 KEYDEV_ERROR=0 local mntkey="/mnt/key/" crypt_filter_ret= |