[pve-devel] [PATCH kernel-meta 04/13] zz-pve-efiboot: adapt to static list of ESPs

[Fabian Grünbichler]

From: Stoiko Ivanov <s.ivanov at proxmox.com>

read a list of vfat UUIDs from /etc/kernel/pve-efiboot-uuids instead of
taking all blockdevices with vfat and the proper partition type

Otherwise all guests having an ESP would get it mounted and potentially
modified
---
 efiboot/zz-pve-efiboot | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/efiboot/zz-pve-efiboot b/efiboot/zz-pve-efiboot
index ad78caf..1ba0538 100755
--- a/efiboot/zz-pve-efiboot
+++ b/efiboot/zz-pve-efiboot
@@ -6,6 +6,7 @@ set -e
 # https://kernel-team.pages.debian.net/kernel-handbook/ch-update-hooks.html
 
 # relative to the ESP mountpoint
+ESP_LIST="/etc/kernel/pve-efiboot-uuids"
 PMX_ESP_DIR="EFI/proxmox"
 
 MOUNTROOT="${TMPDIR:-/var/tmp}/espmounts"
@@ -42,19 +43,35 @@ else
 	CMDLINE="$(cat /proc/cmdline)"
 fi
 
+potential_esps(){
+	lsblk --list -o PATH,UUID,FSTYPE,PARTTYPE,MOUNTPOINT |
+	awk '$3 == "vfat" && $4 == "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" && $5 == "" {print $1,$2}'
+}
 
 update_esps() {
-	esps="$(lsblk --list -o PATH,UUID,FSTYPE,PARTTYPE,MOUNTPOINT |
-		awk -v OFS=';' '$3 == "vfat" && $4 == "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" && $5 == "" {print $1,$2}')"
+	if [ ! -f "${ESP_LIST}" ]; then
+	    warn "No ${ESP_LIST} found cannot update installed kernels - exiting"
+	    esps="$(potential_esps)"
+	    warn "add the UUIDs of one of the following devices to ${ESP_LIST}:"
+	    warn "${esps}"
+	    exit 1
+	fi
+	cat "${ESP_LIST}" | while IFS= read -r uuid; do
+		if ! (echo "${uuid}" | grep -qE '[0-9a-fA-F]{4}-[0-9a-fA-F]{4}'); then
+			warn "WARN: ${uuid} read from ${ESP_LIST} does not look like a VFAT-UUID - skipping"
+			continue
+		fi
 
-	for esp in ${esps}; do
-		path="$(echo "${esp}" | cut -d ';' -f1)"
-		uuid="$(echo "${esp}" | cut -d ';' -f2)"
-		mountpoint="${MOUNTROOT}/${uuid}"
+		path="/dev/disk/by-uuid/$uuid"
+		if [ ! -e "${path}" ]; then
+			warn "WARN: ${path} does not exist - clean ${ESP_LIST}! - skipping"
+			continue
+		fi
 
+		mountpoint="${MOUNTROOT}/${uuid}"
 		mkdir -p "${mountpoint}"
 		mount "${path}" "${mountpoint}" || \
-			{ warn "mount of ${esp} failed - skipping"; continue; }
+			{ warn "mount of ${path} failed - skipping"; continue; }
 		if [ ! -f "${mountpoint}/loader/loader.conf" ]; then
 			warn "${path} contains no loader.conf - skipping"
 			continue
@@ -69,7 +86,7 @@ update_esps() {
 		remove_old_kernels "${mountpoint}"
 
 		umount "${mountpoint}" || \
-			{ warn "umount of ${esp} failed - failure"; exit 2; }
+			{ warn "umount of ${path} failed - failure"; exit 2; }
 
 		rmdir "${mountpoint}"
 	done
-- 
2.20.1