From c641c95c0d61b6b3fae587609e030dff60534342 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 20 Nov 2024 09:31:53 +0100 Subject: [PATCH] luks_format --- sh/fs.sh | 2 +- sh/rescue/hetzner.sh | 4 ++-- sh/rescue/ovh.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sh/fs.sh b/sh/fs.sh index 2635ce0..67bd2a5 100644 --- a/sh/fs.sh +++ b/sh/fs.sh @@ -93,7 +93,7 @@ fs_wipe() { fi } -luks_format() { +sh_fs_luks_format() { local passphrase="${1}" local device="${2}" local label="${3}" diff --git a/sh/rescue/hetzner.sh b/sh/rescue/hetzner.sh index 80d901b..5f27eaa 100644 --- a/sh/rescue/hetzner.sh +++ b/sh/rescue/hetzner.sh @@ -92,7 +92,7 @@ rescue_wipe_0_init_hetzner_8_8() { fs_raid_create \ "crypt" "00000000:00000000:00000000:00000001" ${members} # encrypt - luks_format "${passphrase}" "/dev/md/crypt" + sh_fs_luks_format "${passphrase}" "/dev/md/crypt" # open echo "${passphrase}" | cryptsetup luksOpen "/dev/md/crypt" "crypt" @@ -107,7 +107,7 @@ rescue_wipe_2_make_hetzner_8_8() { # read passphrase passphrase="$(read_passphrase)" # encrypt - luks_format "${passphrase}" "/dev/md/crypt" + sh_fs_luks_format "${passphrase}" "/dev/md/crypt" # open echo "${passphrase}" | cryptsetup luksOpen "/dev/md/crypt" "crypt" diff --git a/sh/rescue/ovh.sh b/sh/rescue/ovh.sh index b12c50b..333e365 100644 --- a/sh/rescue/ovh.sh +++ b/sh/rescue/ovh.sh @@ -36,7 +36,7 @@ rescue_wipe_0_init_ovh_vle2() { # crypt / wipe fs_wipe "${device}1" "1G" 1 # crypt / encrypt - luks_format "${passphrase}" "${device}1" + sh_fs_luks_format "${passphrase}" "${device}1" # crypt / open echo "${passphrase}" | cryptsetup luksOpen "${device}1" "crypt" @@ -52,7 +52,7 @@ rescue_wipe_2_make_ovh_vle2() { # read passphrase passphrase="$(read_passphrase)" # crypt / encrypt - luks_format "${passphrase}" "${device}1" + sh_fs_luks_format "${passphrase}" "${device}1" # crypt / open echo "${passphrase}" | cryptsetup luksOpen "${device}1" "crypt"