diff --git a/sh/fs.sh b/sh/fs.sh index 67bd2a5..46fe414 100644 --- a/sh/fs.sh +++ b/sh/fs.sh @@ -72,7 +72,7 @@ fs_raid_create() { fi } -fs_wipe() { +sh_fs_wipe() { local device="${1}" local buffer="${2}" local count="${3}" diff --git a/sh/rescue/common.sh b/sh/rescue/common.sh index b108681..d28591b 100644 --- a/sh/rescue/common.sh +++ b/sh/rescue/common.sh @@ -84,7 +84,7 @@ rescue_upload() { } rescue_wipe_1_zero() { - fs_wipe "/dev/mapper/crypt" "512M" + sh_fs_wipe "/dev/mapper/crypt" "512M" } rescue_wipe_3_close() { diff --git a/sh/rescue/hetzner.sh b/sh/rescue/hetzner.sh index 5f27eaa..3e95ba3 100644 --- a/sh/rescue/hetzner.sh +++ b/sh/rescue/hetzner.sh @@ -34,7 +34,7 @@ rescue_wipe_0_init_hetzner_8_8() { echo echo "#${number}: ${device}4" # wipe bios - fs_wipe "${device}4" + sh_fs_wipe "${device}4" done # number=0 @@ -43,7 +43,7 @@ rescue_wipe_0_init_hetzner_8_8() { echo echo "#${number}: ${device}3" # format esp - fs_wipe "${device}3" "1M" + sh_fs_wipe "${device}3" "1M" fs_make_fat "${device}3" "esp-${number}" "0000000${number}" # mount esp mkdir --parents "/media/esp/${number}" @@ -56,7 +56,7 @@ rescue_wipe_0_init_hetzner_8_8() { echo echo "#${number}: ${device}2" # wipe boot - fs_wipe "${device}2" "1G" 1 + sh_fs_wipe "${device}2" "1G" 1 done # members="" @@ -81,7 +81,7 @@ rescue_wipe_0_init_hetzner_8_8() { echo echo "#${number}: ${device}1" # wipe crypt head - fs_wipe "${device}1" "1G" 1 + sh_fs_wipe "${device}1" "1G" 1 done # members="" diff --git a/sh/rescue/ovh.sh b/sh/rescue/ovh.sh index 333e365..732b045 100644 --- a/sh/rescue/ovh.sh +++ b/sh/rescue/ovh.sh @@ -16,16 +16,16 @@ rescue_wipe_0_init_ovh_vle2() { mkpart bios 1 2 \ set 4 bios_grub on # bios / wipe - fs_wipe "${device}4" + sh_fs_wipe "${device}4" # esp / wipe - fs_wipe "${device}3" "1M" + sh_fs_wipe "${device}3" "1M" # esp / format fs_make_fat "${device}3" "esp" "00000001" # esp / mount mkdir --parents "/media/esp" mount "${device}3" "/media/esp" # boot / wipe - fs_wipe "${device}2" "1G" 1 + sh_fs_wipe "${device}2" "1G" 1 # boot / format fs_make_btrfs "${device}2" "boot" \ "00000000-0000-0000-0000-00000000000b" @@ -34,7 +34,7 @@ rescue_wipe_0_init_ovh_vle2() { mount --options "autodefrag,compress-force=zstd" \ "${device}2" "/media/boot" # crypt / wipe - fs_wipe "${device}1" "1G" 1 + sh_fs_wipe "${device}1" "1G" 1 # crypt / encrypt sh_fs_luks_format "${passphrase}" "${device}1" # crypt / open