esptool: move more variables to functions

which is sourced by all scripts anyway.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/efiboot/functions b/efiboot/functions
index 1327bb41c88b42f29c0c548979c4e5bc6694f81f..cb6cd621109d42877b60fe89a3860d1061c71dba 100755 (executable)
--- a/efiboot/functions
+++ b/efiboot/functions
@@ -1,6 +1,13 @@
 #! /bin/sh
 set -e
 
+ESP_LIST="/etc/kernel/pve-efiboot-uuids"
+ESPTYPE='c12a7328-f81f-11d2-ba4b-00a0c93ec93b'
+
+# relative to the ESP mountpoint
+PMX_ESP_DIR="EFI/proxmox"
+PMX_LOADER_CONF="loader/loader.conf"
+
 # adapted from /etc/kernel/postinst.d/apt-auto-removal as present in
 # debian's apt package:
 #

diff --git a/efiboot/zz-pve-efiboot b/efiboot/zz-pve-efiboot
index 8d5d62593f3067769c1592a7e2c8bcbab6cd7b75..560856f0208c2a485bbe62508c7f3ee9371efcd8 100755 (executable)
--- a/efiboot/zz-pve-efiboot
+++ b/efiboot/zz-pve-efiboot
@@ -5,9 +5,6 @@ set -e
 # /usr/lib/kernel/install.d/90-loaderentry.install, see also
 # 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"
 
@@ -49,7 +46,7 @@ potential_esps(){
 
 update_esps() {
        if [ ! -f "${ESP_LIST}" ]; then
-           warn "No ${ESP_LIST} found cannot update installed kernels - exiting"
+           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}"
@@ -71,12 +68,12 @@ update_esps() {
                mkdir -p "${mountpoint}"
                mount "${path}" "${mountpoint}" || \
                        { warn "mount of ${path} failed - skipping"; continue; }
-               if [ ! -f "${mountpoint}/loader/loader.conf" ]; then
+               if [ ! -f "${mountpoint}/$PMX_LOADER_CONF" ]; then
                        warn "${path} contains no loader.conf - skipping"
                        continue
                fi
-               if [ ! -d "${mountpoint}/EFI/proxmox" ]; then
-                       warn "${path} contains no EFI/proxmox - skipping"
+               if [ ! -d "${mountpoint}/$PMX_ESP_DIR" ]; then
+                       warn "${path}/$PMX_ESP_DIR does not exist- skipping"
                        continue
                fi