diff --git a/bash/rescue-hetzner.sh b/bash/rescue-hetzner.sh index 6386621..142e07d 100644 --- a/bash/rescue-hetzner.sh +++ b/bash/rescue-hetzner.sh @@ -75,11 +75,8 @@ rescue_wipe_0_init_hetzner_8_8() { --uuid "00000000:00000000:00000000:00000002" \ "${members[@]}" # - mkfs.btrfs --force \ - --checksum "sha256" \ - --label "boot" \ - --uuid "00000000-0000-0000-0000-00000000000b" \ - "/dev/md/boot" + fs_make_btrfs "/dev/md/boot" "boot" \ + "00000000-0000-0000-0000-00000000000b" # mount boot mkdir --parents "/media/boot" mount \ @@ -154,11 +151,8 @@ rescue_wipe_2_make_hetzner_8_8() { # passphrase unset passphrase # format crypt - mkfs.btrfs --force \ - --checksum "sha256" \ - --label "crypt" \ - --uuid "00000000-0000-0000-0000-00000000000c" \ - "/dev/mapper/crypt" + fs_make_btrfs "/dev/mapper/crypt" "crypt" \ + "00000000-0000-0000-0000-00000000000c" # mount crypt mkdir --parents "/media/crypt" mount \ diff --git a/bash/rescue-ovh.sh b/bash/rescue-ovh.sh index 0683acf..4792c6c 100644 --- a/bash/rescue-ovh.sh +++ b/bash/rescue-ovh.sh @@ -29,11 +29,8 @@ rescue_wipe_0_init_ovh_vle2() { # boot / wipe fs_wipe "${device}2" "1G" 1 # boot / format - mkfs.btrfs --force \ - --checksum "sha256" \ - --label "boot" \ - --uuid "00000000-0000-0000-0000-00000000000b" \ - "${device}2" + fs_make_btrfs "${device}2" "boot" \ + "00000000-0000-0000-0000-00000000000b" # boot / mount mkdir --parents "/media/boot" mount --options "autodefrag,compress-force=zstd" \ @@ -88,11 +85,8 @@ rescue_wipe_2_make_ovh_vle2() { # passphrase unset passphrase # crypt / format - mkfs.btrfs --force \ - --checksum "sha256" \ - --label "crypt" \ - --uuid "00000000-0000-0000-0000-00000000000c" \ - "/dev/mapper/crypt" + fs_make_btrfs "/dev/mapper/crypt" "crypt" \ + "00000000-0000-0000-0000-00000000000c" # crypt / mount mkdir --parents "/media/crypt" mount --options "autodefrag,compress-force=zstd" \