fix mixed disk sizes & other multi disk issues

diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index e38fa58de8673357e99b29f6322ed3ba5016aa36..96bcefb55d5006275465349429bbc2e5a30f23fd 100755 (executable)
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -13,6 +13,8 @@ case $HOSTNAME in
         echo "FAIBASE DEBIAN DESKTOP STABLE" ;;
     tp)
         echo "FAIBASE DEBIAN DESKTOP" ;;
+    frodo)
+        echo "FAIBASE DEBIAN DESKTOP" ;;
     # faiserver)
     #     echo "FAIBASE DEBIAN DEMO FAISERVER" ;;
     # xfcehost)

diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index e8f0c401850232165c3fbdc5b006a936c62e36d4..7a2c5754878369479d4279c66c093b119e20dde8 100755 (executable)
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -47,6 +47,37 @@ else
     devs=( ${hds[@]} )
 fi
 
+boot_devs=()
+for dev in ${devs[@]}; do
+    if ifclass frodo; then
+        # I ran into a machine where the bios doesn't know about some disks,
+        # so 1st stage of grub also doesn't know about them.
+        # Also, grub does not support mounting degraded btrfs as far as
+        # I can tell with some googling.
+        # From within an arch install env, I could detect them by noting
+        # their partitions were mixed with the next disk in /dev/disk/by-path,
+        # and I have mixed model disks, and I could see the 8 models which showed
+        # up in the bios, and thus see which 2 models were missing.
+        # hdparm -I /dev/sdh will give model info in linux.
+        # However, in fai on jessie, that dir doesn't exist,
+        # and I don't see another way, so I'm hardcoding them.
+        # We still put grub on them and partition them the same, for uniformity
+        # and in case they get moved to a system that can recognize them,
+        # we just exclude them from the boot filesystem.
+        cd /dev/disk/by-id/
+        bad_disk=false
+        for id in ata-TOSHIBA_MD04ACA500_8539K4TQFS9A \
+                      ata-TOSHIBA_MD04ACA500_Y5IFK6IJFS9A; do
+            if [[ $(readlink -f $id) == $dev ]]; then
+                bad_disk=true
+                break
+            fi
+        done
+        $bad_disk || boot_devs+=($dev$bootn)
+    else
+        boot_devs+=($dev$bootn)
+    fi
+done
 
 if [[ ! $DISTRO ]]; then
     if ifclass STABLE; then
@@ -58,6 +89,13 @@ fi
 
 
 
+case ${#boot_devs[@]} in
+    # need double the space if we are raid 10, and then
+    # might as well give some extra overhead.
+    [4-9]*|[1-3]?*) boot_mib=$((boot_mib * 3)) ;;
+esac
+
+
 bpart() { # btrfs a partition
     dev_n=$1
     case ${#@} in
@@ -102,13 +140,6 @@ bios_grub_end=4
 # 1.5 x based on https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/Installation_Guide/sect-disk-partitioning-setup-x86.html#sect-custom-partitioning-x86
 swap_mib=$(( $(grep ^MemTotal: /proc/meminfo | \
                       awk '{print $2}') * 3/(${#devs[@]} * 2 ) / 1024 ))
-# parted will round up the disk size. Do -1 so we can have
-# fully 1MiB unit partitions for easy resizing of the last partition.
-# Otherwise we would pass in -0 for the end argument for the last partition.
-disk_mib=$(( $(parted -m ${devs[0]} unit MiB print | \
-                      sed -nr "s#^${devs[0]}:([0-9]+).*#\1#p") - 1))
-root_end=$(( disk_mib - swap_mib - boot_mib /  ${#devs[@]} ))
-swap_end=$(( root_end + swap_mib))
 
 mkdir -p /tmp/fai
 shopt -s nullglob
@@ -125,6 +156,14 @@ if $partition; then
         done
     done
     for dev in ${devs[@]}; do
+        # parted will round up the disk size. Do -1 so we can have
+        # fully 1MiB unit partitions for easy resizing of the last partition.
+        # Otherwise we would pass in -0 for the end argument for the last partition.
+        disk_mib=$(( $(parted -m $dev unit MiB print | \
+                              sed -nr "s#^$dev:([0-9]+).*#\1#p") - 1))
+        root_end=$(( disk_mib - swap_mib - boot_mib /  ${#boot_devs[@]} ))
+        swap_end=$(( root_end + swap_mib))
+
         parted -s $dev mklabel gpt
         # gpt ubuntu cloud image uses ~4. fai uses 1 MiB.
         # I read something in the parted manual saying cheap flash media
@@ -160,7 +199,7 @@ if $partition; then
                    --key-file $luks_dir/host-$HOSTNAME
     done
     bpart ${crypt_devs[@]/%/$rootn}
-    bpart ${devs[@]/%/$bootn}
+    bpart ${boot_devs[@]}
 else
     for dev in ${devs[@]}; do
         cryptsetup luksOpen $dev$rootn crypt_dev_${dev##/dev/}$rootn \
@@ -228,11 +267,13 @@ EOF
 EOF
 done
 
+# fai would do this:
+#BOOT_DEVICE=\${BOOT_DEVICE:-"${devs[0]}"}
 
 # swaplist seems to do nothing.
 cat >/tmp/fai/disk_var.sh <<EOF
 ROOT_PARTITION=\${ROOT_PARTITION:-$crypt}
 BOOT_PARTITION=\${BOOT_PARTITION:-$first_boot_dev}
-BOOT_DEVICE=\${BOOT_DEVICE:-"${devs[0]}"}
+BOOT_DEVICE="${devs[@]}"
 SWAPLIST=\${SWAPLIST:-"${swaps[@]}"}
 EOF

diff --git a/fai/config/scripts/GRUB_PC/10-setup b/fai/config/scripts/GRUB_PC/10-setup
index c945daf93ba16899476ea4c7335028e6b7648c99..88b557ea694876147a48fdfceef7ec3f4f743b40 100755 (executable)
--- a/fai/config/scripts/GRUB_PC/10-setup
+++ b/fai/config/scripts/GRUB_PC/10-setup
@@ -21,10 +21,10 @@ if [ $FAI_ACTION != "install" ]; then
 fi
 
 $ROOTCMD grub-mkdevicemap --no-floppy
-GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE)
 
 # Check if RAID is used for the boot device
 if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then
+    GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE)
     raiddev=${BOOT_DEVICE#/dev/}
     # install grub on all members of RAID
     for device in `LC_ALL=C perl -ne 'if(/^'$raiddev'\s.+raid\d+\s(.+)/){ $_=$1; s/\d+\[\d+\]//g; print }' /proc/mdstat`; do
@@ -32,10 +32,13 @@ if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then
        $ROOTCMD grub-install --no-floppy "/dev/$device"
     done
 else
-    $ROOTCMD grub-install --no-floppy "$GROOT"
-    if [ $? -eq 0 ]; then
-        echo "Grub installed on $BOOT_DEVICE = $GROOT"
-    fi
+    for dev in $BOOT_DEVICE; do
+        GROOT=$($ROOTCMD grub-probe -tdrive -d $dev)
+        $ROOTCMD grub-install --no-floppy "$GROOT"
+        if [ $? -eq 0 ]; then
+            echo "Grub installed on $dev = $GROOT"
+        fi
+    done
 fi
 $ROOTCMD update-grub