fix efi, autodiscover, add a host

[automated-distro-installer] / fai / config / hooks / partition.DEFAULT

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index ea8d2378039860719cd3e46da40f30d19d979425..4646e568f3cb710317e4fe7a2579dbb5a32b3aa9 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -74,7 +74,7 @@ skiptask partition || ! type skiptask
 
 if ! type -p devbyid; then
   for d in $FAI/distro-install-common \
-             /a/bin/fai/fai/config/distro-install-common $FAI $PWD; do
+               /a/bin/fai/fai/config/distro-install-common $FAI $PWD; do
     [[ -d $d ]] || continue
     if [[ -e $d/devbyid ]]; then
       devbyid=$d/devbyid
@@ -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
 
 
@@ -130,6 +131,7 @@ add-part() { # add partition suffix to $dev
 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; }
 
@@ -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: \
@@ -265,14 +267,19 @@ for dev in ${devs[@]}; do
     boot_devs+=($(bootdev))
   fi
   if [[ $boot_devs && $first ]]; then
+    first_efi=$(efidev)
     first_grub_extdev=$(grub_extdev)
     first=false
   fi
 done
 
+even_raid=false
 if ifclass RAID0 || (( ${#boot_devs[@]} == 1 )); then
   raid_level=0
 elif ifclass RAID1 || (( ${#boot_devs[@]} <= 3 )); then
+  if (( ${#boot_devs[@]} == 2 )); then
+    even_raid=true
+  fi
   raid_level=1
 else
   raid_level=10
@@ -406,6 +413,17 @@ if $partition; then
   fi
   ### end wipefs
 
+
+  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
+      fi
+    done
+  fi
+
   for dev in ${devs[@]}; do
     if [[ $SPECIAL_DISK ]]; then
       dev=$(devbyid $SPECIAL_DISK)
@@ -417,15 +435,19 @@ if $partition; then
     #
     # Note: parted print error output is expected. example:
     # Error: /dev/vda: unrecognised disk label
-    disk_mib=$(( $(parted -m $dev unit MiB print | \
-                     sed -nr "s#^/dev/[^:]+:([0-9]+).*#\1#p") - 1))
+    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))
+    fi
     root_end=$(( disk_mib - swap_mib - boot_mib /  ${#boot_devs[@]} ))
     swap_end=$(( root_end + swap_mib))
 
     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
@@ -435,6 +457,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.
@@ -464,6 +494,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.
@@ -592,6 +625,7 @@ else
 $first_root_crypt  /  btrfs          noatime,subvol=root_$DISTRO$mopts  0 0
 $first_root_crypt  /mnt/root  btrfs  nofail,noatime,subvolid=0$mopts  0 0
 $first_boot_dev  /boot  btrfs        nofail,noatime,subvol=$boot_vol  0 0
+$first_efi  /boot/efi  vfat          nofail  0 0
 $first_boot_dev  /mnt/boot  btrfs    nofail,noatime,subvolid=0  0 0
 EOF
   swaps=()