X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=d896a94d6e2e67a441e32e3446c0f16411b43bfe;hb=32aa53e099349c3fbb867bad480f6b30a5e0d7f0;hp=9ab73b22cceb9a2f91f2932b1c2c864f948484b0;hpb=4a45eef497075283554ba123ae7cf6edc762b083;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 9ab73b2..d896a94 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -48,6 +48,7 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR # # RAID0: forces raid0 filesystem. Normally with 4+ devices, we use # raid10. +# RAID1: forces raid1 filesystem. if [[ $SPECIAL_DISK ]]; then export CLASS_REPARTITION=true @@ -235,8 +236,10 @@ for dev in ${devs[@]}; do fi done -if ifclass RAID0 || (( ${#boot_devs[@]} < 4 )); then +if ifclass RAID0 || (( ${#boot_devs[@]} == 1 )); then raid_level=0 +elif ifclass RAID1 || (( ${#boot_devs[@]} <= 3 )); then + raid_level=1 else raid_level=10 # need double the space if we are raid 10, and then @@ -270,6 +273,7 @@ first_boot_dev=${boot_devs[0]} bpart() { # btrfs a partition case $raid_level in 0) mkfs.btrfs -f $@ ;; + 1) mkfs.btrfs -f -m raid1 -d raid1 $@ ;; 10) mkfs.btrfs -f -m raid10 -d raid10 $@ ;; esac }