fixup

Author: dustymabe

overlay.d/05rhcos/usr/libexec/coreos-update-bootloader

@@ -3,30 +3,35 @@ set -euo pipefail
 
 # https://issues.redhat.com/browse/OCPBUGS-54594
 
-# This script updates the bootloader using bootupd
-# and also detects RAID-1 setups as those requires
-# extra steps.
-if [ -e /dev/disk/by-label/EFI-SYSTEM ]; then
-    echo "Found ESP; calling 'bootupctl update'"
-    bootupctl update
-    exit
-fi
+# This script updates the bootloader using bootupd when it's safe
+# and manually otherwise. Right now bootupd doesn't support RAID-1
+# setups and also not sure of the behavior if there are multiple
+# EFI-SYSTEM labeled filesystems attached.
+
+# Function that actually does the manual copy
+copy_to_esp_device() {
+    local device=$1
+    mount $device /boot/efi
+    echo "[Before Update: ${device}]"
+    find /boot/efi/ -type f | xargs md5sum
+    cp -rp /usr/lib/bootupd/updates/EFI /boot/efi
+    echo "[After Update: ${device}]"
+    find /boot/efi/ -type f | xargs md5sum
+    umount /boot/efi
+}
 
 # Handle RAID case manually since bootupd doesn't support it.
 # https://github.com/coreos/bootupd/issues/132
-#
-# First we'll find the RAID device the root filesystem is
-# mounted from (i.e. /dev/md127).
-root_raid_device=$(findmnt --json --target /sysroot \
-                     | jq -r .filesystems[0].source)
-echo "Detected root raid device is: $root_raid_device"
-# Next we'll find all the devices that are a part of that
-# RAID array that have an ESP (i.e. a vfat formatted partition
-# with a label that starts with "esp-", like "esp-1", "esp-2").
-# and we'll capture the device name for the partition.
-esp_partitions=$(
-    lsblk --paths --fs -J | \
-        jq --arg raid_device "${root_raid_device}" -r '
+update_raid_esp() {
+    local boot_raid_device=$1
+    local devices_json="${2}"
+    echo "Detected boot raid device is: $boot_raid_device"
+    # Next we'll find all the devices that are a part of that
+    # RAID array that have an ESP (i.e. a vfat formatted partition
+    # with a label that starts with "esp-", like "esp-1", "esp-2").
+    # and we'll capture the device name for the partition.
+    esp_partitions=$(
+        jq --arg raid_device "${boot_raid_device}" -r '
             .blockdevices[]
             | select(.children[]?.children[]?.name == $raid_device)
             | .children[]
@@ -35,15 +40,69 @@ esp_partitions=$(
                 (.label != null)    and
                 (.label | startswith("esp"))
               )
+            | .name' <<< "${devices_json}")
+    for part in $esp_partitions; do
+        echo "Found ESP replica in ${part}; updating"
+        copy_to_esp_device $part
+    done
+}
+
+main() {
+    # Grab the info about the systems disks from `lsblk`.
+    block_devices_json=$(lsblk --paths --fs --json)
+
+    # Find the device the boot filesystem is mounted from
+    # (i.e. /dev/md126 or /dev/sda3).
+    boot_fs_device=$(findmnt --json --target /boot  | jq -r .filesystems[0].source)
+
+    # Grab the JSON for the boot partition (i.e. /dev/sda3). This partition
+    # could hold the filesystem directly or it could be a linux_raid_member
+    # in which case the $boot_fs_device will be in the "children" of this
+    # device. Choose .[0] here since we only need to look at the first device
+    # (only RAID will have more than 1 anyway).
+    boot_fs_partition_json=$(
+        jq --arg boot_fs_device "${boot_fs_device}" -r '
+            [
+            .blockdevices[].children[]
+            | select(
+                .name == $boot_fs_device or
+                .children[]?.name == $boot_fs_device
+            )
+            ] | .[0]' <<< "${block_devices_json}")
+
+    # Grab the partition fstype (useful to determine if it's RAID)
+    boot_fs_partition_fstype=$(jq -r '.fstype' <<< "${boot_fs_partition_json}")
+
+    # Determine how many devices are attached with filesystems
+    # with the "EFI-SYSTEM" label.
+    num_efi_system_devices=$(
+        jq -r '
+        [
+        .blockdevices[]
+        | select(.children[]?.label == "EFI-SYSTEM")
+        ] | length' <<< "${block_devices_json}")
+
+    # Now do the updates based on what situation we are in.
+    if [ "${boot_fs_partition_fstype}" == 'linux_raid_member' ]; then
+        # If it's RAID we'll update manually.
+        update_raid_esp $boot_fs_device "${block_devices_json}"
+    elif [ "${num_efi_system_devices}" -gt 1 ]; then
+        echo "Detected more than one ESP device in a non-RAID setup"
+        echo "Falling back to manual copy"
+        # If there is more than one device with the EFI-SYSTEM label
+        # then we'll need to manually do this to make sure we copy
+        # to the right one.
+        esp_device=$(
+            jq --arg boot_fs_device "$boot_fs_device" -r '
+            .blockdevices[]
+            | select(.children[]?.name == $boot_fs_device)
+            | .children[]
+            | select(.label == "EFI-SYSTEM")
             | .name')
-for part in $esp_partitions; do
-    echo "Found ESP replica in ${part}; updating"
-    mount $part /boot/efi
-    echo "[Before Update: ${part}]"
-    find /boot/efi/ -type f | xargs md5sum
-    cp -rp /usr/lib/bootupd/updates/EFI /boot/efi
-    echo "[After Update: ${part}]"
-    find /boot/efi/ -type f | xargs md5sum
-    umount /boot/efi
-done
-sync
+        copy_to_esp_device $esp_device
+    else
+        echo "Found ESP; calling 'bootupctl update'"
+        bootupctl update
+    fi
+    sync # write data out to backing devices
+}