X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Fpartition.DEFAULT;h=bb625fd1d35c1305ef22f1cdea477783739b5f4b;hb=a199d585d33ace63662c0fea99a5c5d6d498d14b;hp=e9cce5009a04fb20311611299064982c7cd51353;hpb=21353fd35096ba6786c1bae3046b763bfeac5890;p=automated-distro-installer diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT index e9cce50..bb625fd 100755 --- a/fai/config/hooks/partition.DEFAULT +++ b/fai/config/hooks/partition.DEFAULT @@ -95,14 +95,15 @@ fi rootn=1 swapn=2 bootn=3 +efin=4 # ext partition so grub can write persistent variables, # so it can do a one time boot. grub can't write to # btrfs or any cow fs because it's more # more complicated to do and they don't want to. -grub_extn=4 +grub_extn=5 # bios boot partition, # https://wiki.archlinux.org/index.php/GRUB -bios_grubn=5 +bios_grubn=6 lastn=$bios_grubn @@ -119,17 +120,13 @@ add-part() { # add partition suffix to $dev d=$1 part=$2 fi - if [[ $d == /dev/disk/by-id/* ]]; then - ret=$d-part$part - else - ret=$d$part - fi - echo $ret + echo $d-part$part } bootdev() { add-part $@ $bootn; } rootdev() { add-part $@ $rootn; } swapdev() { add-part $@ $swapn; } +efidev() { add-part $@ $efin; } grub_extdev() { add-part $@ $grub_extn; } bios_grubdev() { add-part $@ $bios_grubn; } @@ -140,6 +137,11 @@ swap-cryptdev() { crypt-dev $(swapdev $@); } root-cryptname() { crypt-name $(rootdev $@); } swap-cryptname() { crypt-name $(swapdev $@); } +dev-mib() { + echo $(( $(parted -m $dev unit MiB print | \ + sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1)) +} + ##### end function defs if ifclass REPARTITION; then @@ -173,12 +175,12 @@ fi hdds=() ssds=() -cd /sys/block -for disk in [sv]d[a-z]; do +# this excludes usb. note: i may encounter some other type in the future. +for disk in $(lsblk -do name,tran -n | awk '$2 ~ "^(sata|nvme)$" { print $1 }'); do if [[ ${disk_excludes[$disk]} ]]; then continue fi - case $(cat $disk/queue/rotational) in + case $(cat /sys/block/$disk/queue/rotational) in 0) ssds+=(/dev/$disk) ;; 1) hdds+=(/dev/$disk) ;; *) echo "$0: error: unknown /sys/block/$disk/queue/rotational: \ @@ -201,11 +203,10 @@ fi for dev in ${short_devs[@]}; do if $partition; then break; fi y=$(readlink -f $dev) - arr=($y[0-9]) - [[ ${#arr[@]} == "$lastn" ]] || partition=true - for (( i=1; i <= lastn; i++ )); do - [[ -e ${dev}$i ]] || partition=true - done + arr=($y?*) + if (( ${#arr[@]} != lastn )); then + partition=true + fi # On one system, blkid is missing some partitions. # maybe we need a flag, like FUZZY_BLKID or something, so we # can check that at least some exist. @@ -231,7 +232,7 @@ if [[ ! ${devs[0]} ]]; then fi boot_space=0 -first=false +first=true boot_devs=() for dev in ${devs[@]}; do if ifclass frodo; then @@ -264,11 +265,13 @@ for dev in ${devs[@]}; do sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1)) boot_devs+=($(bootdev)) fi - if [[ $boot_devs && $first ]]; then + if $first && [[ $boot_devs ]]; then + first_efi=$(efidev) first_grub_extdev=$(grub_extdev) first=false fi done +first_boot_dev=${boot_devs[0]} even_raid=false if ifclass RAID0 || (( ${#boot_devs[@]} == 1 )); then @@ -336,7 +339,6 @@ if [[ ! $DISTRO ]]; then exit 1 fi fi -first_boot_dev=${boot_devs[0]} bpart() { # btrfs a partition @@ -396,7 +398,7 @@ if $partition; then # if we repartition to the same as an old partition, # we don't want any old fses hanging around. for (( i=1; i <= lastn; i++ )); do - x=$(add-part $dev $i) + x=$(add-part $i) [[ -e $x ]] || continue count_down=10 # wipefs has failed, manual run works, google suggests timing issue @@ -413,10 +415,9 @@ if $partition; then if $even_raid; then for dev in ${devs[@]}; do - disk_mib=$(( $(parted -m $dev unit MiB print | \ - sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1)) - if [[ ! min_disk_mib ]] || (( disk_mib < min_disk_mib )); then - min_disk_mib=$disk_mib + cur_mib=$(dev-mib) + if [[ ! $disk_mib ]] || (( cur_mib < disk_mib )); then + disk_mib=$cur_mib fi done fi @@ -432,11 +433,8 @@ if $partition; then # # Note: parted print error output is expected. example: # Error: /dev/vda: unrecognised disk label - if $even_raid; then - disk_mib=$min_disk_mib - else - disk_mib=$(( $(parted -m $dev unit MiB print | \ - sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1)) + if ! $even_raid; then + disk_mib=$(dev-mib) fi root_end=$(( disk_mib - swap_mib - boot_mib / ${#boot_devs[@]} )) swap_end=$(( root_end + swap_mib)) @@ -444,7 +442,7 @@ if $partition; then parted -s $dev mklabel gpt # MiB because parted complains about alignment otherwise. pcmd="parted -a optimal -s -- $dev" - $pcmd mkpart primary ext3 12MiB ${root_end}MiB + $pcmd mkpart primary ext3 524MiB ${root_end}MiB # without naming, systemd gives us misc errors like: # dev-disk-by\x2dpartlabel-primary.device: Dev dev-disk-by\x2dpartlabel-primary.device appeared twice $pcmd name $rootn root @@ -454,6 +452,14 @@ if $partition; then $pcmd name $swapn swap $pcmd mkpart primary "" ${swap_end}MiB ${disk_mib}MiB $pcmd name $bootn boot + # eufi = bloated, half a gig gimme a break. + $pcmd mkpart primary "fat32" 12MiB 524MiB + $pcmd name $efin efi + $pcmd set $efin esp on + # note, this is shown here: https://support.system76.com/articles/bootloader/ + # but not mentioned https://wiki.archlinux.org/index.php/EFI_system_partition + # probably not needed + $pcmd set $bootn boot on # i only need a few k, but googling min size, # I found someone saying that gparted required # required at least 8 because of their hard drive cylinder size. @@ -483,6 +489,9 @@ if $partition; then sleep 1 secs=$((secs +1)) done + + mkfs.fat -F32 $(efidev) + # Holds just a single file, rarely written, so # use ext2, like was often used for the /boot partition. # This exists because grub can only persist data to a non-cow fs. @@ -600,6 +609,7 @@ umount /mnt if [[ $DISTRO == debianbuster_bootstrap ]]; then cat > /tmp/fai/fstab </tmp/fai/disk_var.sh < /tmp/fai/fstab <> /tmp/fai/fstab <