use pve-efiboot-tool for systemd boot ESP preparation

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/control b/debian/control
index 0bb7caa0511f9e612f629f514ee7a09c0f36dc19..97bf20bc1caffb43005d49b95353e4ce5dbb6144 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,12 +12,20 @@ Homepage: https://www.proxmox.com
 
 Package: pve-installer
 Architecture: all
-Depends: geoip-bin, libgtk3-webkit2-perl, squashfs-tools, ${perl:Depends}
+Depends: geoip-bin,
+         libgtk3-webkit2-perl,
+         pve-kernel-helper,
+         squashfs-tools,
+         ${perl:Depends},
 Description: Proxmox VE Installer
  This package contains the graphical installer for Proxmox VE.
 
 Package: pmg-installer
 Architecture: all
-Depends: geoip-bin, libgtk3-webkit2-perl, squashfs-tools, ${perl:Depends}
+Depends: geoip-bin,
+         libgtk3-webkit2-perl,
+         pve-kernel-helper,
+         squashfs-tools,
+         ${perl:Depends},
 Description: Proxmox Mail Gateway Installer
  This package contains the graphical installer for Proxmox Mail Gateway.

diff --git a/proxinstall b/proxinstall
index aff6c4c7fa39804b971f1de6200590ab2f9069db..b06da138a166a46a64a349c30dd62e95722636cf 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -1154,24 +1154,8 @@ sub compute_swapsize {
 sub prepare_systemd_boot_esp {
     my ($espdev, $targetdir) = @_;
 
-    my $espuuid = find_dev_by_uuid($espdev);
-    my $espmp = "var/tmp/$espuuid";
-    mkdir "$targetdir/$espmp";
-
-    syscmd("mount -n $espdev -t vfat $targetdir/$espmp") == 0 ||
-       die "unable to mount ESP $espdev\n";
-
-    File::Path::make_path("$targetdir/$espmp/EFI/proxmox") ||
-       die "unable to create directory $targetdir/$espmp/EFI/proxmox\n";
-
-    syscmd("chroot $targetdir bootctl --path /$espmp install") == 0 ||
-       die "unable to install systemd-boot loader\n";
-    write_config("timeout 3\ndefault proxmox-*\n",
-       "$targetdir/$espmp/loader/loader.conf");
-
-    syscmd("umount $targetdir/$espmp") == 0 ||
-       die "unable to umount ESP $targetdir/$espmp\n";
-
+    syscmd("chroot $targetdir pve-efiboot-tool init $espdev") == 0 ||
+       die "unable to init ESP and install systemd-boot loader on '$espdev'\n";
 }
 
 sub prepare_grub_efi_boot_esp {