X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=2db69b348b33f8f8e2c99c66112056f443f54b89;hb=bdcc37dee90597b4a65c2ae24b9fc26f15adfc11;hp=8dffd82b89c18a4fec5fd6616a5c6aa722ef35ac;hpb=a018c3030b0ebd751d5667efd96c2fd32f2423e0;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index 8dffd82..2db69b3 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -69,9 +69,7 @@ bootdev() { add-part $@ $bootn; } rootdev() { add-part $@ $rootn; } swapdev() { add-part $@ $swapn; } grub_extdev() { add-part $@ $grub_extn; } -# Commented because it's not used, but left because it -# finishes the pattern and if we ever do need to use it, it's here. -#bios_grubdev() { add-part $@ $bios_grubn; } +bios_grubdev() { add-part $@ $bios_grubn; } crypt-dev() { echo /dev/mapper/crypt_dev_${1##*/}; } crypt-name() { echo crypt_dev_${1##*/}; } @@ -115,8 +113,8 @@ fi for dev in ${short_devs[@]}; do if $partition; then break; fi y=$(readlink -f $dev) - x=($y[0-9]) - [[ ${#x[@]} == "${lastn}" ]] || partition=true + arr=($y[0-9]) + [[ ${#arr[@]} == "${lastn}" ]] || partition=true for (( i=1; i <= lastn; i++ )); do [[ -e ${dev}$i ]] || partition=true done