build server

PR URL: https://www.github.com/delphix/appliance-build/pull/846

Author: tonynguien

bootstrap/roles/appliance-build.bootstrap/tasks/main.yml

@@ -19,6 +19,11 @@
   ansible.builtin.command: bash -c 'rm -rf /etc/apt/sources.list.d/*'
   changed_when: true
 
+- name: Turn off all swap now
+  become: yes
+  command: swapoff -a
+  changed_when: false
+
 - name: Configure apt sources
   vars:
     mirror_url: "{{ lookup('env', 'DELPHIX_PACKAGE_MIRROR_MAIN') }}"

live-build/config/hooks/vm-artifacts/90-raw-disk-image.binary

@@ -345,16 +345,25 @@ for dir in /dev /proc /sys; do
 done
 
 #
-# Mount /boot/efi and do grub and bootctl install
+# Mount ESP and bootctl install
 #
-EFI_DIR="/mnt/boot/efi"
-chroot "$DIRECTORY" mkdir -p $EFI_DIR
-chroot "$DIRECTORY" mount /dev/mapper/${LOOPNAME}p2 $EFI_DIR
+EFI_DIR=$(chroot "$DIRECTORY" mktemp -d -p "/var/tmp/" -t delphix_efi.XXXXXXX)
+chroot "$DIRECTORY" mount -o umask=077 /dev/mapper/${LOOPNAME}p2 $EFI_DIR
+
+ESP=$EFI_DIR
+BOOTLOADER_ID="${BOOTLOADER_ID:-systemd}"
+echo "[*] Installing systemd-boot to $ESP..."
+# 1. Create required directories
+chroot "$DIRECTORY" mkdir -p "$ESP/EFI/systemd" "$ESP/EFI/BOOT" "$ESP/loader/entries"
+
+# 2. Copy systemd-boot binaries
+chroot "$DIRECTORY" cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi "$ESP/EFI/$BOOTLOADER_ID/"
+chroot "$DIRECTORY" cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi "$ESP/EFI/BOOT/BOOTX64.EFI"
 
 # Copy the latest kernel into EFI boot directory
 chroot "$DIRECTORY" cp /boot/initrd.img $EFI_DIR
 chroot "$DIRECTORY" cp /boot/vmlinuz $EFI_DIR
-chroot "$DIRECTORY" bootctl --esp-path=$EFI_DIR install --no-variables
+# chroot "$DIRECTORY" bootctl --esp-path=$EFI_DIR install --no-variables
 
 # Use GRUB_CMDLINE_LINUX_DEFAULT boot options
 source $DIRECTORY/etc/default/grub.d/override.cfg
@@ -385,6 +394,7 @@ auto-firmware yes
 EOF
 
 chroot "$DIRECTORY" umount $EFI_DIR
+chroot "$DIRECTORY" rm -r $EFI_DIR
 
 for dir in /dev /proc /sys; do
 	retry 5 10 umount -R "${DIRECTORY}${dir}"